/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 2665

Added by sgarg over 18 years ago

Commited the wrong MetaCatUtil.java file last time. Making the changes again.

1. Replacing MetaCatUtil.debugMessage or MetaCatUtil.logMetacat call with logMetacat (private Logger object) call
  2. Commented out debugMessage()
  3. Removed getLog() and earlier old log4j code
  4. Removed formattedDebugMessage

     import java.util.regex.PatternSyntaxException;
     import org.apache.log4j.Logger;
     import org.apache.log4j.PropertyConfigurator;
     import org.apache.log4j.BasicConfigurator;
     import edu.ucsb.nceas.dbadapter.AbstractDatabase;
     import edu.ucsb.nceas.utilities.Options;
-...
         private static String[] allowedSubmitters;
         private static String[] deniedSubmitters;
         private static Logger logMetacat = Logger.getLogger(MetaCatUtil.class);
         public static Logger logMetacat = null;
         private static Logger logInfoMetacat = null;
         static {
             MetaCatUtil.logMetacat = Logger.getLogger("Metacat");
             PropertyConfigurator.configure(MetaCatServlet.LOG_CONFIG_NAME);
             MetaCatUtil.logInfoMetacat = Logger.getLogger("Metacat");
             //BasicConfigurator.configure();
         	// Determine our db adapter class and create an instance of that class
             try {
                 dbAdapter = (AbstractDatabase) createObject(getOption("dbAdapter"));
-...
             // read administrator and moderator lists from metacat.properties
             getUserAccessControlLists();
+        }
         /**
          * Instantiate a class using the name of the class at runtime
+         *
-...
             return value;
+        }
         public static Logger getLog() {
         	  return logMetacat;
+        }
         /**
          * Utility method to set an option value from the properties file
+         *
-...
          * @param msg, the content of the message
          * @param debugLevel, an integer indicating the message debug leve
          */
         public static void debugMessage(String msg, int debugLevel)
+        {
             if (debug) {
                 int limit = 1;
                 try {
                     limit = Integer.parseInt(getOption("debuglevel"));
         /**
          * Commenting out the function for now...
          * public static void debugMessage(String msg, int debugLevel)
          * {
          *   if (debug) {
          *       int limit = 1;
          *       try {
          *           limit = Integer.parseInt(getOption("debuglevel"));
+         *
          *       } catch (Exception e) {
          *           System.out.println(e.getMessage());
          *       }
          *       //don't allow the user set debugLevel less than or equals 0
          *       if (debugLevel <= 0) {
          *           debugLevel = 1;
          *       }
+         *
          *       if (debugLevel < limit) {
          *           System.err.println("@debugprefix@ " + msg);
          *       }
          *   }
          *}
          */
                 } catch (Exception e) {
                     System.out.println(e.getMessage());
+                }
                 //don't allow the user set debugLevel less than or equals 0
                 if (debugLevel <= 0) {
                     debugLevel = 1;
+                }
                 if (debugLevel < limit) {
                     System.err.println("@debugprefix@ " + msg);
+                }
+            }
+        }
         /**
          * Utility method to print debugging messages. User can set debug level for
          * this message. The number is fewer, the message is more important. Can be
          * used to control if the carriage return and debugPrefix are printed
          * this message. The number is fewer, the message is more important
+         *
          * @param msg, the content of the message
          * @param debugLevel, an integer indicating the message debug level
          * @param debugPrefix, a boolean indicating whether debugprefix
          *                    should be printed or not
          * @param debugLevel, an integer indicating the message debug leve
          */
         public static void formattedDebugMessage(String msg, int debugLevel,
                                           boolean carriageReturn,
                                           boolean debugPrefix)
         public static void printMessage(String msg)
+        {
             if (debug) {
                 int limit = 1;
                 try {
                     limit = Integer.parseInt(getOption("debuglevel"));
                 } catch (Exception e) {
                     System.out.println(e.getMessage());
+                }
                 //don't allow the user set debugLevel less than or equals 0
                 if (debugLevel <= 0) {
                     debugLevel = 1;
+                }
                 if (debugLevel < limit) {
                     if(debugPrefix) {
                         if(carriageReturn)
                             System.err.println("@debugprefix@ " + msg);
                         else
                             System.err.print("@debugprefix@ " + msg);
                     } else {
                         if(carriageReturn)
                             System.err.println(msg);
                         else
                             System.err.print(msg);
+                    }
+                }
+            }
         	System.err.println("@debugprefix@ " + msg);
+        }
         public static Vector getOptionList(String optiontext)
+        {
             Vector optionsVector = new Vector();
-...
             int count = 0; //keep track how many & was found
             Vector list = new Vector();// keep index number for &
             if (url == null) {
                 MetaCatUtil.debugMessage("url is null and null will be returned",
 );
                 logMetacat.info("url is null and null will be returned");
                 return docid;
+            }
             // the first element in list is 0
-...
                     // get substring beween two &
                     String str = url.substring(
                             ((Integer) list.elementAt(count - 1)).intValue(), i);
                     MetaCatUtil.debugMessage("substring between two & is: " + str,
 );
                     logMetacat.info("substring between two & is: " + str);
                     //if the subString contains docid, we got it
                     if (str.indexOf(DOCID) != -1) {
                         //get index of '="
-...
             // and
             // the end of string
             if (!find) {
                 MetaCatUtil.debugMessage("Checking the last substring", 35);
                 logMetacat.info("Checking the last substring");
                 String str = url.substring(((Integer) list.elementAt(count))
                         .intValue() + 1, url.length());
                 MetaCatUtil.debugMessage("Last substring is: " + str, 30);
                 logMetacat.info("Last substring is: " + str);
                 if (str.indexOf(DOCID) != -1) {
                     //get index of '="
                     int start = getIndexForGivenChar(str, '=') + 1;
-...
                     find = true;
                 }//if
             }//if
             MetaCatUtil.debugMessage("The docid from online url is:" + docid, 30);
             logMetacat.info("The docid from online url is:" + docid);
             return docid.trim();
+        }
-...
             int end   = identifier.length();
             accessionNumber = identifier.substring(start, end);
+          }
           MetaCatUtil.debugMessage("The accession number from url is " +
                                      accessionNumber, 10);
           logMetacat.warn("The accession number from url is " +
                                      accessionNumber);
           return accessionNumber;
+        }
-...
             int index = -1;
             // make sure str is not null
             if (str == null) {
                 MetaCatUtil.debugMessage(
                         "The given str is null and -1 will be returned", 30);
                 logMetacat.info(
                         "The given str is null and -1 will be returned");
                 return index;
+            }
             // got though the string
-...
                     break;
                 }//if
             }//for
             MetaCatUtil.debugMessage("the index for char " + character + " is: "
                     + index, 30);
             logMetacat.info("the index for char " + character + " is: "
                     + index);
             return index;
+        }
-...
+        {
             String docId = null;
             if (str == null) {
                 MetaCatUtil.debugMessage(
                 logMetacat.info(
                         "The given str is null and null will be returned"
                                 + " in getDocIdfromString", 30);
                                 + " in getDocIdfromString");
                 return docId;
             } //make sure docid is not null
             int dotNumber = 0;//count how many dots in given string
-...
             String seperator = getOption("accNumSeparator");
             int indexOfLastSeperator = accessionNumber.lastIndexOf(seperator);
             docid = accessionNumber.substring(0, indexOfLastSeperator);
             MetaCatUtil.debugMessage("after parsing accessionnumber, docid is "
                     + docid, 30);
             logMetacat.info("after parsing accessionnumber, docid is "
                     + docid);
             return docid;
+        }
-...
             accessionNumber = accessionNumber.substring(0, indexOfLastSeperator);
             indexOfLastSeperator = accessionNumber.lastIndexOf(seperator);
             docid = accessionNumber.substring(0, indexOfLastSeperator) + version;
             MetaCatUtil.debugMessage("after parsing accessionnumber, docid is "
                                      + docid, 30);
             logMetacat.info("after parsing accessionnumber, docid is "
                                      + docid);
             return docid;
+        }
-...
             if (docid == null) {
                 docid = getDocIdFromAccessionNumber(str);
+            }
             MetaCatUtil.debugMessage("The docid get from smart docid getor is "
                     + docid, 30);
             logMetacat.info("The docid get from smart docid getor is "
                     + docid);
             return docid;
+        }
-...
             rev = accessionNumber.substring(indexOfLastSeperator + 1,
                     accessionNumber.length());
             revNumber = Integer.parseInt(rev);
             MetaCatUtil.debugMessage("after parsing accessionnumber, rev is "
                     + revNumber, 30);
             logMetacat.info("after parsing accessionnumber, rev is "
                     + revNumber);
             return revNumber;
+        }
-...
+                }
+            }
             MetaCatUtil.debugMessage("Docid without rev from inlinedata id: "
                     + docidWithoutRev, 35);
             logMetacat.info("Docid without rev from inlinedata id: "
                     + docidWithoutRev);
             return docidWithoutRev;
+        }
-...
+                }
             }//for
             MetaCatUtil.debugMessage("The new string without space is:"
                     + newUrl.toString(), 35);
             logMetacat.info("The new string without space is:"
                     + newUrl.toString());
             return newUrl.toString();
         }// replaceWhiteSpaceForUR
-...
             } catch (PatternSyntaxException pse) {
             	list = null;
                 MetaCatUtil.debugMessage("Error in MetacatServlet.init: "
                     + pse.getMessage(), 20);
                 logMetacat.error("Error in MetacatServlet.init: "
                     + pse.getMessage());
+            }
             return list;
+        }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 2665

Added by sgarg over 18 years ago