/src/edu/ucsb/nceas/metacat/DBEntityResolver.java - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 694

Added by bojilova about 23 years ago

reject writing DTD file if it already exists

     import java.io.File;
     import java.io.Reader;
     import java.io.BufferedReader;
     import java.io.BufferedInputStream;
     import java.io.FileWriter;
     import java.io.BufferedWriter;
     import java.io.InputStream;
-...
             dbSystemID = uploadDTD(dbSystemID);
+          }
           // check URLConnection first
           // open URLConnection to check first
           InputStream istream = checkURLConnection(dbSystemID);
           // need to register System ID in db XML Catalog if not yet
           if ( !doctypeIsInDB ) {
             // new DTD from outside URL location; try to upload on Metacat
             if ( dtdtext == null ) {
               dbSystemID = uploadDTDFromURL(istream, dbSystemID);
+            }
             registerDTD(doctype, dbSystemID);
+          }
           // return a byte-input stream for use
           InputSource is = new InputSource(dbSystemID);
           //is.setPublicId(doctype);
           //is.setSystemId(dbSystemID);
           // close and open URLConnection again
           try {
             istream.close();
           } catch (IOException e) {
             throw new SAXException
             ("DBEntityResolver.resolveEntity(): " + e.getMessage());
+          }
           istream = checkURLConnection(dbSystemID);
           is.setByteStream(istream);
           return is;
         } else {
           // use the provided systemId for other cases
           // use provided systemId for the other cases
           InputStream istream = checkURLConnection(systemId);
           return null;
-...
+      }
       /**
        * Upload new DTD text identified by @systemId on Metacat file system
        * Upload new DTD text identified by @systemId to Metacat file system
        */
       private String uploadDTD ( String systemId )
                      throws SAXException
-...
           // open file writer to write the input into it
           //String dtdPath = "/opt/tomcat/webapps/bojilova/dtd/";
           File f = new File(dtdPath, filename);
          synchronized (f) {
           try {
             if ( f.exists() && !f.canWrite() ) {
               throw new IOException("Not writable: " + f.getCanonicalFile());
             if ( f.exists() ) {
               throw new IOException("File already exist: " + f.getCanonicalFile());
             //if ( f.exists() && !f.canWrite() ) {
             //  throw new IOException("Not writable: " + f.getCanonicalFile());
+            }
           } catch (SecurityException se) {
             // if a security manager exists,
-...
     	    out.flush();
     	    out.close();
     	    fw.close();
          } // end of synchronized
         } catch (MalformedURLException e) {
           throw new SAXException
           ("DBEntityResolver.uploadDTD(): " + e.getMessage());
-...
         return  dtdURL + filename;
+      }
       /**
        * Upload new DTD located at outside URL to Metacat file system
        */
       private String uploadDTDFromURL(InputStream istream, String systemId)
                      throws SAXException
+      {
         MetaCatUtil util = new MetaCatUtil();
         String dtdPath = util.getOption("dtdPath");
         String dtdURL = util.getOption("dtdURL");
         // get filename from systemId
         String filename = systemId;
         int slash = Math.max(filename.lastIndexOf('/'), filename.lastIndexOf('\\'));
         if ( slash > -1 ) {
           filename = filename.substring(slash + 1);
+        }
         // writing dtd text on Metacat file system as filename
         try {
           // create a buffering character-input stream
           // that uses a default-sized input buffer
           BufferedInputStream in = new BufferedInputStream(istream);
           // open file writer to write the input into it
           //String dtdPath = "/opt/tomcat/webapps/bojilova/dtd/";
           File f = new File(dtdPath, filename);
          synchronized (f) {
           try {
             if ( f.exists() ) {
               throw new IOException("File already exist: " + f.getCanonicalFile());
             //if ( f.exists() && !f.canWrite() ) {
             //  throw new IOException("Not writable: " + f.getCanonicalFile());
+            }
           } catch (SecurityException se) {
             // if a security manager exists,
             // its checkRead method is called for f.exist()
             // or checkWrite method is called for f.canWrite()
             throw se;
+          }
           // create a buffered character-output stream
           // that uses a default-sized output buffer
           FileWriter fw = new FileWriter(f);
           BufferedWriter out = new BufferedWriter(fw);
           // read the input and write into the file writer
     	    int inputByte;
     	    while ( (inputByte = in.read()) != -1 ) {
     	      out.write(inputByte);
       	    //out.newLine(); //instead of out.write('\r\n');
+    	    }
           // the input and the output streams must be closed
     	    in.close();
     	    out.flush();
     	    out.close();
     	    fw.close();
          } // end of synchronized
         } catch (MalformedURLException e) {
           throw new SAXException
           ("DBEntityResolver.uploadDTDFromURL(): " + e.getMessage());
         } catch (IOException e) {
           throw new SAXException
           ("DBEntityResolver.uploadDTDFromURL(): " + e.getMessage());
         } catch (SecurityException e) {
           throw new SAXException
           ("DBEntityResolver.uploadDTDFromURL(): " + e.getMessage());
+        }
         //String dtdURL = "http://dev.nceas.ucsb.edu/bojilova/dtd/";
         return  dtdURL + filename;
+      }
       /**
        * Check URL Connection for @systemId, and return an InputStream
        * that can be used to read from the systemId URL.  The parser ends
        * up using this via the InputSource to read the DTD.

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 694

Added by bojilova about 23 years ago