Displaying differences for changeset
 
display as  

src/java/bin/ages/ages.jar

 

src/java/m/oms/ages/V1_0.java

@@ -208,12 +208,13 @@
             dsl = parameter().getString(KEY_SCRIPT_NP,
                     resources().getFile(KEY_SCRIPT_NP).toString());
         }
+
         // pass request param to model runtime parameter -> run.inc
         Map<String, String> agesParam = new LinkedHashMap<>();
         Utils.passReqQuotedParam(agesParam, parameter(), reqParams);
 
         // scalar parameter
-        Utils.passOptParam(agesParam, parameter(), optParams);
+        Utils.passOptQuotedParam(agesParam, parameter(), optParams);
 
         // optional flags
         Utils.passOptQuotedParam(agesParam, parameter(), flags);

src/java/oms/utils/Utils.java

@@ -230,6 +230,11 @@
 
     /**
      * pass a required parameter, quoted (string).
+     *
+     * @param p
+     * @param param
+     * @param names
+     * @throws csip.ServiceException
      */
     public static void passReqQuotedParam(Map<String, String> p,
             PayloadParameter param, String... names) throws ServiceException {
@@ -240,6 +245,11 @@
 
     /**
      * pass optional parameter, no quotes.
+     *
+     * @param p
+     * @param param
+     * @param names
+     * @throws csip.ServiceException
      */
     public static void passOptParam(Map<String, String> p,
             PayloadParameter param, String... names) throws ServiceException {
@@ -250,6 +260,38 @@
         }
     }
 
+//        ArrayList<String> keyListOF = new ArrayList<>(OF.keySet());
+//        ArrayList<String> allList = new ArrayList<>();
+//        allList = keyListOF;
+//
+//        allList.add("cal_startTime");
+//        allList.add("cal_endTime");
+//        allList.add("payload");
+//        allList.add("loglevel");
+//
+//        for (String e : optParams) {
+//            allList.add(e);
+//        }
+//        for (String r : reqParams) {
+//            allList.add(r);
+//        }
+//        for (String t : flags) {
+//            allList.add(t);
+//        }
+//
+//        // while loop
+//        for (String s : parameter().getNames()) {
+//            boolean test_in = false;
+//            //System.out.println(" AgES Name= " + s);
+//            if (allList.contains(s)) {
+//                test_in = true;
+//            }
+//
+//            if (!test_in) {
+//                throw new ServiceException("Ages global parameter input error: " + s);
+//                //System.out.println(" not in " + s);
+//            }
+//        }
     public static void passOptQuotedParam(Map<String, String> p,
             PayloadParameter param, String... names) throws ServiceException {
         for (String name : names) {