Displaying differences for changeset
 
display as  

lib/WepsReportData.jar

 

src/java/d/rusle2/climateQuery.sh

@@ -1,2 +1,3 @@
 #curl -X POST -H "Content-Type: application/json" http://csip.engr.colostate.edu:8081/csip/d/rusle2/climate/1.0 -d @./climateReqEpa1.json
-curl -X POST -H "Content-Type: application/json" http://csip.engr.colostate.edu:8090/csip-erosion/d/rusle2/climate/1.0 -d @./climateReqEpa1.json
+#curl -X POST -H "Content-Type: application/json" http://csip.engr.colostate.edu:8090/csip-erosion/d/rusle2/climate/1.0 -d @./climateReqEpa1.json
+curl -X POST -H "Content-Type: application/json" http://csip.engr.colostate.edu:8090/csip-erosion/d/rusle2/climate/1.0 -d @./climateReqHawaii.json

src/java/d/rusle2/soilMappingcheck.sh

@@ -1,6 +1,9 @@
 echo "csip-8081"
-curl -X POST -H "Content-Type: application/json" http://csip.engr.colostate.edu:8081/csip/d/soilmappingcheck -d @./soilmappingcheck.json
+#curl -X POST -H "Content-Type: application/json" http://csip.engr.colostate.edu:8081/csip/d/soilmappingcheck -d @./soilmappingcheck.json
 echo ""
 echo "csip-8083"
-curl -X POST -H "Content-Type: application/json" http://csip.engr.colostate.edu:8083/csip/d/soilmappingcheck -d @./soilmappingcheck.json
+#curl -X POST -H "Content-Type: application/json" http://csip.engr.colostate.edu:8083/csip/d/soilmappingcheck -d @./soilmappingcheck.json
 echo ""
+echo "csip-8086"
+curl -X POST -H "Content-Type: application/json" http://csip.engr.colostate.edu:8086/csip-erosion/d/soilmappingcheck -d @./soilmappingcheck.json
+echo ""

src/java/m/rusle2/V1_3.java

@@ -354,7 +354,14 @@
         fos.write("FilesOpen profiles\\#ENTRY_MODEL PRIVATE\n".getBytes());
         fos.write("Activate profiles\\model\n".getBytes());
 
-        fos.write(("RomeFileSetAttrValue CLIMATE_PTR \"" + climatePtr + "\"\n").getBytes());
+        // OLD VERSION, WHERE WE GOT CLIMATE DIRECTLY FROM NGINX AND DIDN'T MODIFY IT
+        // fos.write(("RomeFileSetAttrValue CLIMATE_PTR \"" + climatePtr + "\"\n").getBytes());
+        
+        // NEW VERSION, Where the climate file must be modified to work
+        fos.write(("FilesOpen \"#XML:" + new File(getWorkspaceDir(), "cli_file" + 0 + ".xml" + "\"\n")).getBytes());
+        fos.write(("RomeFileSetAttrValue CLIMATE_PTR \"climates\\aaa\"\n").getBytes());
+        
+        // New version, where we have to process the nginx file so R2 reads it
 
         // climate stub if needed
         //fos.write("RomeFileSetAttrValue CLIMATE_PTR \"climates\\USA\\Idaho\\Power County\\ID_Power_R_11\"\n".getBytes());