fix error in query import

CategoricalData · Jul 29, 2024 · c3df89e · c3df89e
1 parent 14d0649
commit c3df89e
Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/catdata/cql/Mapping.java b/src/catdata/cql/Mapping.java
@@ -25,7 +25,7 @@ public static String coq(String s) {
 		if (s.equals("*")) return "times";
 		if (s.equals("-")) return "minus";
 		if (s.equals("/")) return "divide";		
-
+		if (s.length()==0) return "";
 		s = s.replaceAll("[^a-zA-Z0-9]", "");
 		if (!Character.isAlphabetic(s.charAt(0)))
 			s = ("cql" + s);

diff --git a/src/catdata/cql/Query.java b/src/catdata/cql/Query.java
@@ -694,11 +694,13 @@ public Query(Map<String, Ty> params, Map<String, Term<Ty, Void, Sym, Void, Void,
 		}
 
 	//	System.out.println("!!!");
-	//	System.out.println(fks);
-	//	System.out.println("@@@");
 
 		for (Fk2 fk2 : fks.keySet()) {
-			Map<String, Term<Ty, En1, Sym, Fk1, Att1, String, String>> www = new THashMap<>(sks.get(fk2));
+
+			Map<String, Term<Ty, En1, Sym, Fk1, Att1, String, String>> www = new THashMap<>();
+			if (sks.containsKey(fk2)) { www.putAll(sks.get(fk2)); }
+
+
 			for (String v : params.keySet()) {
 				www.put(v, Term.Sk(v));
 			}