diff util/index/TrixIndex.py @ 84:cb62314a6297 draft

planemo upload for repository https://github.com/goeckslab/hub-archive-creator commit ac73da32d59853ca563e7939d05016a6f3a6899e-dirty

--- a/util/index/TrixIndex.py	Mon Oct 30 12:01:23 2017 -0400
+++ b/util/index/TrixIndex.py	Fri Nov 03 17:08:19 2017 -0400
@@ -7,19 +7,18 @@
 from ExternIndex import ExternIndex
 
 class TrixIndex(ExternIndex):
-    def __init__(self, indexIx, indexIxx, trackName, mySpecieFolderPath, **args):
+    def __init__(self, indexIx, indexIxx, trackName, mySpecieFolderPath, trixId, **args):
         self.logger = logging.getLogger(__name__)
         self.indexIx = indexIx
         self.indexIxx = indexIxx
         self.trackName = trackName
         self.mySpecieFolderPath = mySpecieFolderPath
         self.index_settings = collections.OrderedDict()
-        if "trixId" in args:
-            self.trixId = args["trixId"]
-        else:
-            self.trixId = None
+        self.trixId = trixId
+        
 
     def setExtLink(self):
+        self.setSearchIndex()
         self.moveIndexFile()
         self.index_settings["searchTrix"] = "trix/%s" % self.indexIxName
         return self.index_settings
@@ -38,14 +37,9 @@
         shutil.copyfile(self.indexIxx, self.indexIxxPath)
 
     def setSearchIndex(self):
-        if self.trixId:
-            set_index = set()
-            set_index.add(self.trixId)
-            set_index.add("name")
-            search_index = ",".join(set_index)
-        else:
-            search_index = "name"
-        logging.debug("trixId= %s, searchIndex= %s", self.trixId, search_index)
-        self.index_settings["searchIndex"] = search_index
+        if not self.trixId:
+            self.logger.error("Didn't specify Trix Id")
+        self.logger.debug("trixId= %s, searchIndex= %s", self.trixId, self.trixId)
+        self.index_settings["searchIndex"] = self.trixId