Displaying differences for changeset
 
display as  

nbproject/build-impl.xml

@@ -1014,8 +1014,8 @@
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
         <copyfiles files="${reference.csip-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.Lmod2Rusle2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${reference.Man2Weps.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.WepsReportData.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${reference.Man2Weps.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.commons-lang-2.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jsf-api.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jsf-impl.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1033,8 +1033,8 @@
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
         <copyfiles files="${reference.csip-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.Lmod2Rusle2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${reference.Man2Weps.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.WepsReportData.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${reference.Man2Weps.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.commons-lang-2.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jsf-api.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jsf-impl.jar}" todir="${build.web.dir}/WEB-INF/lib"/>

nbproject/project.properties

@@ -44,7 +44,7 @@
 file.reference.oro-2.0.8.jar=lib/oro-2.0.8.jar
 file.reference.postgresql-9.0-801.jdbc4.jar=lib/postgresql-9.0-801.jdbc4.jar
 file.reference.truezip_6.6.jar=lib/truezip_6.6.jar
-file.reference.WepsReportData.jar=lib/WepsReportData.jar
+file.reference.WepsReportData.jar=tools/WepsReportData/dist/WepsReportData.jar
 includes=**
 j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
@@ -56,8 +56,8 @@
 javac.classpath=\
     ${reference.csip-core.jar}:\
     ${file.reference.Lmod2Rusle2.jar}:\
+    ${reference.Man2Weps.jar}:\
     ${file.reference.WepsReportData.jar}:\
-    ${reference.Man2Weps.jar}:\
     ${file.reference.commons-lang-2.4.jar}:\
     ${file.reference.jsf-api.jar}:\
     ${file.reference.jsf-impl.jar}:\

nbproject/project.xml

@@ -20,11 +20,11 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.WepsReportData.jar}</file>
+                    <file>${reference.Man2Weps.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${reference.Man2Weps.jar}</file>
+                    <file>${file.reference.WepsReportData.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">

src/java/m/ApplicationConfig.java

@@ -32,6 +32,7 @@
      */
     private void addRestResourceClasses(Set<Class<?>> resources) {
         resources.add(csip.ArchiveService.class);
+        resources.add(csip.CatalogService.class);
         resources.add(csip.ControlService.class);
         resources.add(csip.ModelDataService.class);
         resources.add(csip.QueryService.class);

src/java/m/sci/V1_3.java

@@ -114,6 +114,7 @@
                     req_results.put(RES_SLOPE_T_VALUE);
                     req_results.put(RES_SLOPE_DEGRAD);
                     getRequest().getJSONObject(KEY_METAINFO).put(KEY_REQUEST_RESULTS, req_results);
+                    getRequest().getJSONObject(KEY_METAINFO).put(KEY_MODE, SYNC);
                     //LOG.info("This is the request =) : "+getRequest().toString());
                     //String url = Config.getString("codebase.url", "bad")+"/csip-erosion/m/rusle2/1.2";
                     //LOG.info(url);

src/java/m/weps/V1_3.java

@@ -838,7 +838,7 @@
         reportdata.m_sUnits = "US";
 
         // Load the file data.
-        reportdata.loadFiles();
+        reportdata.loadFiles(getWorkspaceDir().toString());
 
 //        // Dump the loaded data as text for debugging purposes.
 //        LOG.info("hash map output=" + con.toString());

tools/WepsReportData/src/usda/weru/weps/reports/query/OutputResultSet.java

@@ -30,6 +30,7 @@
     public class OutputResultSet extends WepsResultSet {
     private static final String PATH_META = "tables/detail.xml";
     private static final Logger LOGGER = Logger.getLogger(OutputResultSet.class);
+    private String workingDir = "";
     public static final String FILE_NAME = RunFileData.WepsOutput;
     
     // Names of the table and columns in the SQL data model.
@@ -292,6 +293,10 @@
     protected boolean isUSUnits(){
         return Util.USUnits.equals(m_sUnits);
     }
+    
+    public void setWorkingDir(String path){
+        workingDir = path;
+    }
 
     public synchronized void fill() {
 //        if (c_filled) {
@@ -300,7 +305,7 @@
 //
         if(c_meta == null){
             c_meta = new WepsTableMeta();
-            File workDir = new File(System.getProperty("user.dir"));
+            File workDir = new File(workingDir);
             File metaFile = new File(workDir, PATH_META);
             c_meta.fromFile(metaFile);
         }

tools/WepsReportData/src/wepsreportdata/WepsReportData.java

@@ -45,7 +45,7 @@
      * Load WEPS output files into the data map.
      * @return true on success, false on failure.
      */
-    public boolean loadFiles() {
+    public boolean loadFiles(String path) {
         try {
             // Try loading each of the output files in sequence.
             // Configuration is handled within each of these functions.
@@ -53,7 +53,7 @@
             loadConfidenceIntervalResultSet();
             loadHarvestsResultSet();
             loadManagementResultSet();
-            loadOutputResultSet();
+            loadOutputResultSet(path);
             loadRunsResultSet();
             loadSciEnergyResultSet();
             loadStirEnergyResultSet();
@@ -94,12 +94,14 @@
 
     /**
      * Load the WEPS output data from one of its text files.
+     * @param path
      */
-    public void loadOutputResultSet() {
+    public void loadOutputResultSet(String path) {
         // @todo Check configuration options to see if we should load this file.
         try {
             Binaries.unpackResourceAbsolute(DETAIL_SOURCE, System.getProperty("user.dir") +"/"+ PATH_META);
             OutputResultSet resultset = new OutputResultSet(m_con, m_sInputDirectory, m_sUnits);
+            resultset.setWorkingDir(path);
             resultset.fill();        
         }
         catch (Exception e) {
@@ -145,6 +147,7 @@
 
         final String sUsage =
         "usage: wepsreportdata [options] infolder\n" +
+        "Working dir path \n"+
         "\n";
         
         ////////////////////////////////////////////////////////////
@@ -159,7 +162,7 @@
         ////////////////////////////////////////////////////////////
         // Get command line arguments.
         
-        if (args.length < 1)
+        if (args.length < 2)
         {
             // Print a usage message and quit
             System.out.println(sUsage);
@@ -178,7 +181,7 @@
         reportdata.m_sUnits = "US";
         
         // Load the file data.
-        reportdata.loadFiles();
+        reportdata.loadFiles(args[1]);
         
         // Dump the loaded data as text for debugging purposes.
         System.out.println(con.toString());