Changing from DCIS to DCISmodule

config/module.xml

@@ -4,7 +4,7 @@
        xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
     <bean id="moduleBean" class="org.labkey.api.module.SimpleModule">
-        <property name="name" value="DCIS"/>
+        <property name="name" value="DCISmodule"/>
         <property name="requiredServerVersion" value="0.0"/>
         <property name="moduleDependencies" value=""/>
         <property name="buildUser" value="astuden"/>

queries/lists/importXML.js

@@ -1,4 +1,4 @@
-let shared = require("DCIS/dcisFcns");
+let shared = require("DCISmodule/dcisFcns");
 var console = require("console");
 var LABKEY = require("labkey");
 var analysis = require("analysisModule/analysisFcns");

scripts/DCIS/dcisFcns.js

@@ -1,188 +0,0 @@
-function startImport(LABKEY,analysis,console,row){
-   console.log('startInsert');
-   let jobRow=new Object();
-
-//get the script by name
-   let selectRows=new Object();
-   selectRows.containerPath='Analysis/Run';
-   selectRows.schemaName='lists';
-   selectRows.queryName='scripts';
-   selectRows.filterArray=[LABKEY.Filter.create('name','importXML.py')];
-   let data=LABKEY.Query.selectRows(selectRows);
-   console.log('Scripts['+data.rows.length+']: '+data.rows[0].Key);
-   jobRow.script=data.rows[0].Key;
-
-//get the parameterFile by name
-   let sr1=new Object();
-   sr1.containerPath='Analysis/Run';
-   sr1.schemaName='lists';
-   sr1.queryName='parameterFiles';
-   sr1.filterArray=[LABKEY.Filter.create('parameterFile','importXML.json')];
-   let dataP=LABKEY.Query.selectRows(sr1);
-   console.log('Parameter file['+dataP.rows.length+']: '+dataP.rows[0].Key);
-   jobRow.parameterFile=dataP.rows[0].Key;
-
-   jobRow.runType='python';
-   jobRow.server='vangogh.fmf.uni-lj.si';
-   //jobRow.cpuList=undefined;
-   jobRow.parameterOverload="importXML.json:key="+row.Key+";importXML.json:seqNumOffset="+row.seqNumOffset;
-   analysis.startRun(LABKEY,console,jobRow);
-
-}
-
-exports.startImport=startImport;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-