/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 1760

Added by Jing Tao over 21 years ago

Change string to stringreader to save memory.

             } catch (NullPointerException npe) {}
+          }
           StringReader xml = null;
           StringReader xml = new StringReader(doctext[0]);
           boolean validate = false;
           DocumentImplWrapper documentWrapper = null;
           try {
             // look inside XML Document for <!DOCTYPE ... PUBLIC/SYSTEM ... >
             // in order to decide whether to use validation parser
             validate = needDTDValidation(doctext[0]);
             validate = needDTDValidation(xml);
             if (validate)
+            {
               // set a dtd base validation parser
               String rule = DocumentImpl.DTD;
               documentWrapper = new DocumentImplWrapper(rule, validate);
+            }
             else if (needSchemaValidation(doctext[0]))
             else if (needSchemaValidation(xml))
+            {
               // for eml2
               if (needEml2Validation(doctext[0]))
               if (needEml2Validation(xml))
+              {
                  // set eml2 base validation parser
                 String rule = DocumentImpl.EML2;
-...
               documentWrapper = new DocumentImplWrapper("", false);
+            }
             xml = new StringReader(doctext[0]);
             String[] action = (String[])params.get("action");
             String[] docid = (String[])params.get("docid");
             String newdocid = null;
-...
                       getDBConnection("MetaCatServlet.handleInsertOrUpdateAction");
               serialNumber=dbConn.getCheckOutSerialNumber();
               // write the document to the database
                // write the document to the database
               try
+              {
                 String accNumber = docid[0];
-...
        * Parse XML Document to look for <!DOCTYPE ... PUBLIC/SYSTEM ... >
        * in order to decide whether to use validation parser
        */
       private static boolean needDTDValidation(String xmltext) throws IOException {
       private static boolean needDTDValidation(StringReader xmlreader) throws
                                                                  IOException
+      {
         StringReader xmlreader = new StringReader(xmltext);
         StringBuffer cbuff = new StringBuffer();
         java.util.Stack st = new java.util.Stack();
         boolean validate = false;
-...
+        }
         // close the stream
         xmlreader.close();
         xmlreader.reset();
         // check the stack whether it contains the keywords:
         // "<!DOCTYPE", "PUBLIC" or "SYSTEM", and ">" in this order
-...
       // END OF INSERT/UPDATE SECTION
       /* check if the xml string contains key words to specify schema loocation*/
       private boolean needSchemaValidation(String xml)
       private boolean needSchemaValidation(StringReader xml) throws IOException
+      {
         boolean needSchemaValidate =false;
         if (xml == null)
-...
                                    needSchemaValidate, 10);
           return needSchemaValidate;
+        }
         System.out.println("before get target line");
         String targetLine = getSchemaLine(xml);
         System.out.println("before get target line");
         // to see if the second line contain some keywords
         if (targetLine != null && (targetLine.indexOf(SCHEMALOCATIONKEYWORD) != -1||
                  targetLine.indexOf(NONAMESPACELOCATION) != -1 ))
-...
+      }
        /* check if the xml string contains key words to specify schema loocation*/
       private boolean needEml2Validation(String xml)
       private boolean needEml2Validation(StringReader xml) throws IOException
+      {
         boolean needEml2Validate =false;
         String emlNameSpace = "=\""+DocumentImpl.EMLNAMESPACE+"\"";
         String emlNameSpace =DocumentImpl.EMLNAMESPACE;
         String schemaLocationContent = null;
         if (xml == null)
+        {
           MetaCatUtil.debugMessage("Validation for schema is " +
-...
+        }
         String targetLine = getSchemaLine(xml);
         if (targetLine != null && targetLine.indexOf(EML2KEYWORD) != -1 &&
             targetLine.indexOf(emlNameSpace) != -1)
         if (targetLine != null)
+        {
           // if contains schema location key word, should be validate
           needEml2Validate = true;
           int startIndex = targetLine.indexOf(SCHEMALOCATIONKEYWORD);
           int start = 1;
           int end   = 1;
           String schemaLocation = null;
           int count = 0;
           if (startIndex != -1)
+          {
             for ( int i=startIndex; i<targetLine.length(); i++)
+            {
               if (targetLine.charAt(i) =='"')
+              {
                 count ++;
+              }
               if (targetLine.charAt(i) =='"' && count == 1)
+              {
                 start = i;
+              }
               if (targetLine.charAt(i) =='"' && count == 2)
+              {
                 end = i;
                 break;
+              }
+            }
+          }
           schemaLocation = targetLine.substring(start+1, end);
           MetaCatUtil.debugMessage("schemaLocation in xml is: "+schemaLocation, 30);
           if ( schemaLocation.indexOf(emlNameSpace) != -1)
+          {
             needEml2Validate = true;
+          }
+        }
         MetaCatUtil.debugMessage("Validation for eml is " +
-...
+      }
       private String getSchemaLine(String xml)
       private String getSchemaLine(StringReader xml) throws IOException
+      {
         // find the line
         String secondLine = null;
-...
         int endIndex = 0;
         int startIndex = 0;
         final int TARGETNUM = 2;
         for (int i=0; i<xml.length(); i++)
         StringBuffer buffer = new StringBuffer();
         boolean comment =false;
         char thirdPreviousCharacter = '?';
         char secondPreviousCharacter ='?';
         char previousCharacter = '?';
         char currentCharacter = '?';
         while ( (currentCharacter = (char) xml.read()) != -1)
+        {
           // didn't count comment
           if (xml.charAt(i) =='<' && xml.charAt(i+1) != '!')
           //in a comment
           if (currentCharacter =='-' && previousCharacter == '-'  &&
               secondPreviousCharacter =='!' && thirdPreviousCharacter == '<')
+          {
             comment = true;
+          }
           //out of comment
           if (comment && currentCharacter == '>' && previousCharacter == '-' &&
               secondPreviousCharacter =='-')
+          {
              comment = false;
+          }
           //this is not comment
           if (currentCharacter !='!' && previousCharacter == '<' && !comment)
+          {
             count ++;
             //find start index
             if (count == TARGETNUM)
+            {
               startIndex = i;
+            }
           }//if
           // find the end index
           if (count== TARGETNUM && xml.charAt(i) =='>')
+          }
           // get target line
           if (count == TARGETNUM && currentCharacter !='>')
+          {
             endIndex = i;
             break;
           }//if
         }//for
         // get the second line string
         MetaCatUtil.debugMessage("The start index for second line: "+startIndex, 25);
         MetaCatUtil.debugMessage("The end index for second line: "+endIndex, 25);
         if (startIndex != 0 && endIndex != 0)
+        {
           secondLine = xml.substring(startIndex+1, endIndex);
         }//if
             buffer.append(currentCharacter);
+          }
           if (count == TARGETNUM && currentCharacter == '>')
+          {
               break;
+          }
           thirdPreviousCharacter = secondPreviousCharacter;
           secondPreviousCharacter = previousCharacter;
           previousCharacter = currentCharacter;
+        }
         secondLine = buffer.toString();
         MetaCatUtil.debugMessage("the second line string is: "+secondLine, 25);
         xml.reset();
         return secondLine;
+      }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 1760

Added by Jing Tao over 21 years ago