diff util/index/TrixIndex.py @ 3:fa990284327b draft default tip

planemo upload for repository https://github.com/goeckslab/hub-archive-creator commit ac73da32d59853ca563e7939d05016a6f3a6899e-dirty
author yating-l
date Mon, 30 Oct 2017 11:58:31 -0400
parents 85195e0d4b71
children
line wrap: on
line diff
--- a/util/index/TrixIndex.py	Fri Sep 29 14:50:50 2017 -0400
+++ b/util/index/TrixIndex.py	Mon Oct 30 11:58:31 2017 -0400
@@ -7,20 +7,19 @@
 from ExternIndex import ExternIndex
 
 class TrixIndex(ExternIndex):
-    def __init__(self, indexIx, indexIxx, trackName, mySpecieFolderPath, trixId, **args):
+    def __init__(self, indexIx, indexIxx, trackName, mySpecieFolderPath, **args):
+        self.logger = logging.getLogger(__name__)
         self.indexIx = indexIx
         self.indexIxx = indexIxx
         self.trackName = trackName
         self.mySpecieFolderPath = mySpecieFolderPath
-        self.trixId = trixId
         self.index_settings = collections.OrderedDict()
-        if "default_index" in args:
-            self.default_index = args["default_index"]
+        if "trixId" in args:
+            self.trixId = args["trixId"]
         else:
-            self.default_index = None
+            self.trixId = None
 
     def setExtLink(self):
-        self.setSearchIndex()
         self.moveIndexFile()
         self.index_settings["searchTrix"] = "trix/%s" % self.indexIxName
         return self.index_settings
@@ -39,13 +38,14 @@
         shutil.copyfile(self.indexIxx, self.indexIxxPath)
 
     def setSearchIndex(self):
-        if self.default_index:
+        if self.trixId:
             set_index = set()
             set_index.add(self.trixId)
-            set_index.add(self.default_index)
+            set_index.add("name")
             search_index = ",".join(set_index)
         else:
-            search_index = self.trixId
+            search_index = "name"
         logging.debug("trixId= %s, searchIndex= %s", self.trixId, search_index)
         self.index_settings["searchIndex"] = search_index
+