Commit b599a584 authored by Staiger, Christine's avatar Staiger, Christine
Browse files

Fixing small bugs

parent 4eb8db23
......@@ -217,7 +217,7 @@ class elabUpload():
self.elnUploadButton.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
except Exception as e:
logging.info("ElabUpload UploadData: "+repr(error))
logging.info("ElabUpload UploadData: "+repr(e))
self.errorLabel.setText(repr(e))
self.elnUploadButton.setEnabled(True)
self.elnUploadButton.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
......@@ -261,7 +261,7 @@ class Worker(QObject):
self.progress.emit(3)
self.finished.emit()
except Exception as e:
logging.info("ElabUpload data upload and annotation worker: "+repr(error))
logging.info("ElabUpload data upload and annotation worker: "+repr(e))
print(repr(e))
self.annotateElab()
......
......@@ -284,9 +284,9 @@ class irodsBrowser():
self.__clearErrorLabel()
self.__clearViewTabs()
self.widget.metadataTable.setRowCount(0);
self.widget.aclTable.setRowCount(0);
self.widget.resourceTable.setRowCount(0);
self.widget.metadataTable.setRowCount(0)
self.widget.aclTable.setRowCount(0)
self.widget.resourceTable.setRowCount(0)
col = index.column()
row = index.row()
......@@ -413,7 +413,7 @@ class irodsBrowser():
self.widget.errorLabel.setText(
"IRODS NETWORK ERROR: No Connection, please check network")
except Exception as error:
print("ERROR upload :", fileSelect[0], "failed; \n\t", repr(error))
print("ERROR download :", parent+'/'+objName, "failed; \n\t", repr(error))
self.widget.errorLabel.setText(repr(error))
......
......@@ -142,9 +142,9 @@ class irodsDataCompression():
def dataCreateExtractFinished(self, success, message, operation):
self.widget.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
self.enableButtons(True)
stdout, stderr = message
if success and operation == "create":
idx, source = self.collectionTreeModel.get_checked()
stdout, stderr = message
self.widget.createStatusLabel.setText("STATUS: Created " + str(stdout))
parentIdx = self.collectionTreeModel.getParentIdx(idx)
self.collectionTreeModel.refreshSubTree(parentIdx)
......
......@@ -3,6 +3,7 @@ from PyQt5.QtWidgets import QDialog, QMessageBox
from PyQt5.uic import loadUi
import os
from utils.utils import getDownloadDir
import logging
class irodsSearch(QDialog):
def __init__(self, ic, collTable):
......
......@@ -47,7 +47,7 @@ def getConfig(path):
def connectIRODS(config):
#icommands present and irods_environment file present and user wants to use standard envFile
standardEnv = os.path.expanduser('~' +os.sep+'.irods/irods_environment.json')
standardEnv = os.path.expanduser('~' +os.sep+'.irods'+os.sep+'irods_environment.json')
if os.path.exists(standardEnv) and \
(config['iRODS']['irodsenv'] == '' or config['iRODS']['irodsenv'] == standardEnv):
try:
......@@ -68,7 +68,7 @@ def connectIRODS(config):
print(BLUE+"INFO: Data up and download by python API."+DEFAULT)
else:
raise FileNotFoundError('Environment file not found: '+ envFile)
raise FileNotFoundError('Environment file not found e.g. '+ standardEnv)
return ic
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment