Merge pull request #508 from ontologyportal/Rose_5-18-26

Removed Logging Pollution and Refactored KBmanager.initializeOnce()

Author: apease

.github/workflows/ant.yml

@@ -7,7 +7,8 @@ on:
     branches: [ "master", "main" ]
   pull_request:
     branches: [ "master", "main" ]
-
+  workflow_dispatch:
+    
 env:
   DEFAULT_DOCKER_ACCOUNT: apease
   SUMO_REF: 5051a4ebf1a8d1c00e602bcdabaa7b5bd3a5ed1c

src/java/com/articulate/sigma/FormulaPreprocessor.java

@@ -721,7 +721,7 @@ private Map<String,Set<String>> computeVariableTypesRecurse(KB kb, Formula f,
             if (Formula.isQuantifier(carstr))  // skip the quantified variable list
                 start = 2;
             if (Formula.isLogicalOperator(carstr) && f.listLength() == 2 && f.getArgument(1).isVariable()) {
-                System.out.println("INFO in FormulaPreprocessor.computeVariableTypesRecurse(): logical op with var arg " + f.getFormula());
+                // System.out.println("INFO in FormulaPreprocessor.computeVariableTypesRecurse(): logical op with var arg " + f.getFormula());
                 MapUtils.addToMap(result,f.getArgument(1).toString(),"Formula");  // When a variable is an argument to a logical operator, it's a formula
             }
             Formula farg;

src/java/com/articulate/sigma/HTMLformatter.java

@@ -346,7 +346,7 @@ public static String showStatistics(KB kb) {
             long serLastModified = kbManagerSer.exists() ? kbManagerSer.lastModified() : 0L;
             long cacheLastModified = cacheFile.exists() ? cacheFile.lastModified() : 0L;
             if (cacheFile.exists() && cacheLastModified >= serLastModified) {
-                System.out.println("[showStatistics] Using cached HTML stats for " + kb.name);
+                // System.out.println("[showStatistics] Using cached HTML stats for " + kb.name);
                 return Files.readString(cacheFile.toPath(), StandardCharsets.UTF_8);
             }
             System.out.println("[showStatistics] Recomputing statistics for " + kb.name);

src/java/com/articulate/sigma/KBmanager.java

@@ -197,9 +197,10 @@ public void read(String s) {
             this.isDoc = parsed.isDoc;
             this.isRule = parsed.isRule;
             this.containsNumber = parsed.containsNumber;
-        }else{
-            System.out.println("[FormulaAST - read] : SuokifVisitor couldn't parse the formula: " + s);
         }
+        // else {
+        //     System.out.println("[FormulaAST - read] : SuokifVisitor couldn't parse the formula: " + s);
+        // }
     }
 
 

src/java/com/articulate/sigma/parsing/FormulaAST.java

@@ -1155,7 +1155,7 @@ private void writeWordNetRelationDefinitions(PrintWriter pw) throws IOException
      */
     private void writeWordNetSynset(PrintWriter pw, String synset) {
 
-    	System.out.println("INFO in OWLtranslator.writeWordNetSynset(): " + synset);
+    	// System.out.println("INFO in OWLtranslator.writeWordNetSynset(): " + synset);
         if (synset.startsWith("WN30-"))
             synset = synset.substring(5);
         ArrayList al = (ArrayList) WordNet.wn.synsetsToWords.get(synset);

src/java/com/articulate/sigma/trans/OWLtranslator.java

@@ -413,7 +413,7 @@ public static char posNumberToLetter(char POS) {
         case '4': return 'r';
         case '5': return 's';
         }
-        System.err.println("Error in WordNetUtilities.posNumberToLetter(): bad number: " + POS);
+        // System.err.println("Error in WordNetUtilities.posNumberToLetter(): bad number: " + POS);
         return 'n';
     }
 

src/java/com/articulate/sigma/wordNet/WordNetUtilities.java

@@ -21,7 +21,7 @@ nonRelTerm = request.getParameter("nonrelation");
 relTerm = StringUtil.emptyString(relTerm) ? request.getParameter("relation") : "";
 
 // ???
-if (!StringUtil.emptyString(filename)) {
+if (!StringUtil.emptyString(filename) && false) {
     int l = 0;
     if (!StringUtil.emptyString(line)) {
         try {l = Integer.parseInt(line);}
@@ -72,7 +72,7 @@ else if ((kb != null) && (term != null) && kb.containsTerm(term)) {  // Build th
         Map<String, String> fm = kb.getFormatMap(lang);
         String fmValue = null;
         if (fm != null) fmValue = fm.get(term);
-        if (fmValue == null) System.out.println("INFO in BrowseBody.jsp: No format map entry for \"" + term + "\" in language " + lang);
+        //if (fmValue == null) System.out.println("INFO in BrowseBody.jsp: No format map entry for \"" + term + "\" in language " + lang);
     }
     else {
         Map<String, String> tfm = kb.getTermFormatMap(lang);
@@ -97,7 +97,6 @@ else if ((kb != null) && (term != null) && kb.containsTerm(term)) {  // Build th
             if (!StringUtil.emptyString(verbs)) show.append("<P>" + verbs);
             show.append("</small></td>");
         }
-        else System.out.println("INFO in BrowseBody.jsp: No synsets for term " + term);
         show.append("</tr></table>\n");
     }
     show.append ("</b></font></td></tr></table>\n");

web/jsp/BrowseBody.jsp

@@ -22,7 +22,6 @@
   String baseDir = mgr.getPref("baseDir");
   String kbDir = mgr.getPref("kbDir");
   boolean isAdministrator = role.equalsIgnoreCase("admin");
-  KBmanager.getMgr().initializeOnce();
   String pageName = "KBs";
   String pageString = "Knowledge Bases";
   %>