Merge pull request #246 from JeffersonLab/drop_and_pop_as_found

Drop and pop as found

Author: markito3

vsdb/BScrawler.py

@@ -67,6 +67,8 @@ def checkOasisCVMFS(packagename,version,dirtag):
         folder_name="evtgen-"
     elif packagename.replace("\"","") == "hepmc":
         folder_name="HepMC-"
+    elif packagename.replace("\"","") == "diracxx":
+        folder_name="Diracxx-"
     else:
         folder_name=folder_name+"-"
 
@@ -95,10 +97,10 @@ def main(argv):
     pushcmd="mysql --host="+dbhost+" --database="+dbname+" --user="+dbuser#+"<tables.sql"
 
     p = subprocess.Popen(pushcmd.split(" "),stdin=subprocess.PIPE)
-    stdout,stderr = p.communicate(file("/work/halld2/home/tbritton/GlueX_Software/build_scripts/vsdb/tables.sql").read())
+    stdout,stderr = p.communicate(file("/group/halld/Software/build_scripts/vsdb/tables.sql").read())
 
 
-    reconpackcmd="xsltproc /work/halld2/home/tbritton/GlueX_Software/build_scripts/xml/packages_sql.xslt /work/halld2/home/tbritton/GlueX_Software/build_scripts/xml/packages.xml | grep INSERT | "+"mysql -h "+dbhost+" -D "+dbname+" -u "+dbuser
+    reconpackcmd="xsltproc /group/halld/Software/build_scripts/xml/packages_sql.xslt /group/halld/Software/build_scripts/xml/packages.xml | grep INSERT | "+"mysql -h "+dbhost+" -D "+dbname+" -u "+dbuser
     #print reconpackcmd
 
     ps = subprocess.Popen(reconpackcmd,shell=True,stdout=subprocess.PIPE,stderr=subprocess.STDOUT)
@@ -124,14 +126,15 @@ def main(argv):
 
         directories=os.listdir(loc)
         for afile in directories:
-            #if "_jlab" not in afile:
-            #    continue
+            
             if ".xml" not in afile:
                 continue
             if "~" in afile:
                 continue
             if afile == "version_jlab.xml" or afile == "version_set_correlations.xml" or afile=="version.xml":
                 continue
+            #if "test" in afile:
+            #    continue
             # ADD afile to versionset.  Get that version set id
             check_for_file="SELECT id from versionSet where filename=\""+afile+"\";"
             #print check_for_file
@@ -185,12 +188,13 @@ def main(argv):
                 #if 'name' not in child.attrib:
                 #    continue
                 check_package_num="SELECT id from package where name=\""+child.attrib['name']+"\";"
-                #print check_package_num
+                print check_package_num
                 curs.execute(check_package_num)
                 num = curs.fetchall()
 
                 ID=-1
-                #print num
+                print("Getting ID number")
+                print num
                 #if len(num[0])
                 if num[0]['id']:
                     ID=num[0]['id']