Merge branch 'master' of gitlab.in2p3.fr:pipelet/pipelet

pipelet/utils.py

@@ -388,7 +388,7 @@ def rebuild_db_from_disk(pipedir, sqlfile=None):
         #s        = curr_dir.split("/")[-1]
         #kk       = s.split("_")[-1]
         #s = s.replace ("_"+kk, "")
-        gr = re.search (r"/([a-zA-Z0-9]+)(_[a-zA-Z0-9])*_([a-zA-Z0-9]+)$", curr_dir).groups()[:-1] # remove segkey
+        gr = re.search (r"/([a-zA-Z0-9_]+)(_[a-zA-Z0-9])*_([a-zA-Z0-9]+)$", curr_dir).groups()[:-1] # remove segkey
         s  = gr[0]
         for g in gr[1:]:
             if g:
@@ -458,7 +458,7 @@ def rebuild_db_from_disk(pipedir, sqlfile=None):
             ## insert values in db
             task_id_cache[t] = meta['id']#t.split("_")[-2].split("/")[-1]
 
-            c = conn.execute('insert into tasks (task_id, seg_id, output, input, begun_on, ended_on, queued_on,status,str_input) values (?, ?, ?, ?, ?, ?, ?, ?, ?)',(task_id_cache[t], v, pickle.dumps(meta["output"]), pickle.dumps(meta["input"]), meta["begun_on"], meta["ended_on"], meta["queued_on"], meta["status"],t))
+            c = conn.execute('insert into tasks (task_id, seg_id, output, input, begun_on, ended_on, queued_on,status,str_input) values (?, ?, ?, ?, ?, ?, ?, ?, ?)',(task_id_cache[t], v, meta["output"], meta["input"], meta["begun_on"], meta["ended_on"], meta["queued_on"], meta["status"],t))
             
     ## 5---: task_relations from meta + task input 
     ## need to restart the loop in order to use the right task_id

scripts/lspipe

@@ -76,6 +76,8 @@ class Pipe():
         self.conn  = self.cache.getdb(pipepath, dbfile)
         if tag:
             s = self.conn.execute('select seg_id from segments where tag == ?',(tag,)).fetchone()
+            if s is None:
+                s = self.conn.execute('select seg_id from segments where tag == ?',(";"+tag,)).fetchone()
         else:
             s = self.conn.execute('select seg_id from segments where curr_dir like ?',("%"+self.path+"%",)).fetchone()
         lstseg = [s[0]]

sonar-project.properties

+sonar.projectKey=pipelet
+sonar.projectName=pipelet
+sonar.projectVersion=1.0
+
+sonar.sourceEncoding=UTF-8
+sonar.cxx.cppcheck.reportPath=cppcheck.xml
+sonar.cxx.coverage.reportPath=coverage.xml
+sonar.sources=scripts, pipelet