/ - Diff - Metacat - Ecoinformatics Redmine

             String response = streamToString(is);
             //System.out.println("response: " + response);
             Vector<Document> docs = parseResponse(response);
             printHeader("Parsing source results");
             D1Client d1 = new D1Client(destinationUrl + "/");
             printHeader("Processing " + docs.size() + " results.");
             printHeader("logging in to the destination " + destinationUrl);
             AuthToken authtoken = d1.login(username, password);
             for(int i=0; i<docs.size(); i++)
-...
             //submitter
             Principal p = new Principal();
             p.setValue("");
             p.setValue("unknown");
             sm.setSubmitter(p);
             sm.setRightsHolder(p);
             try
-...
             int start = doc.indexOf(field);
             int end = doc.indexOf(fieldend);
             String s = doc.substring(start + field.length(), end);
             System.out.println("field: " + fieldname + " : " + s);
             //System.out.println("field: " + fieldname + " : " + s);
             return s;
+        }

+            }
             // For Metadata and Data, insert the system metadata into the object store too
             insertSystemMetadata(sysmeta, sessionData);
             String sysMetaLocalId = insertSystemMetadata(sysmeta, sessionData);
             //get the document info.  add any access params for the sysmeta too
             try
+            {
                 Hashtable<String, Object> h = im.getDocumentInfo(sysMetaLocalId);
                 Vector v = (Vector)h.get("access");
                 for(int i=0; i<v.size(); i++)
+                {
                     Hashtable ah = (Hashtable)v.elementAt(i);
                     String principal = (String)ah.get("principal_name");
                     String permission = (String)ah.get("permission");
                     String permissionType = (String)ah.get("permission_type");
                     String permissionOrder = (String)ah.get("permission_order");
                     this.setAccess(token, guid, principal, permission, permissionType, permissionOrder, false);
+                }
+            }
             catch(Exception e)
+            {
                 logMetacat.error("Error setting permissions on System Metadata object " +
                         " with id " + sysMetaLocalId + ": " + e.getMessage());
+            }
             logMetacat.debug("Returning from CrudService.create()");
             EventLog.getInstance().log(metacatUrl,
                     username, localId, "create");
-...
+        }
         /**
          * insert a systemMetadata doc
          * insert a systemMetadata doc, return the localId of the sysmeta
          */
         private void insertSystemMetadata(SystemMetadata sysmeta, SessionData sessionData)
         private String insertSystemMetadata(SystemMetadata sysmeta, SessionData sessionData)
             throws ServiceFailure
+        {
             logMetacat.debug("Starting to insert SystemMetadata...");
-...
             //link it to the data or metadata document
             IdentifierManager.getInstance().createSystemMetadataMapping(
                     sysmeta.getIdentifier().getValue(), sysMetaGuid.getValue());
             return localId;
+        }
         /**
-...
           throws Exception
+        {
             IdentifierManager im = IdentifierManager.getInstance();
             Hashtable<String, String> docInfo = im.getDocumentInfo(localId);
             Hashtable<String, Object> docInfo = im.getDocumentInfo(localId);
             //get the document text
             int rev = im.getLatestRevForLocalId(localId);
-...
             sm.setIdentifier(identifier);
             //set the object format
             String doctype = docInfo.get("doctype");
             ObjectFormat format = ObjectFormat.convert(docInfo.get("doctype"));
             String doctype = (String)docInfo.get("doctype");
             ObjectFormat format = ObjectFormat.convert((String)docInfo.get("doctype"));
             if(format == null)
+            {
                 if(doctype.trim().equals("BIN"))
-...
             //submitter
             Principal p = new Principal();
             p.setValue(docInfo.get("user_owner"));
             p.setValue((String)docInfo.get("user_owner"));
             sm.setSubmitter(p);
             sm.setRightsHolder(p);
             try
+            {
                 Date dateCreated = parseMetacatDate(docInfo.get("date_created"));
                 Date dateCreated = parseMetacatDate((String)docInfo.get("date_created"));
                 sm.setDateUploaded(dateCreated);
                 Date dateUpdated = parseMetacatDate(docInfo.get("date_updated"));
                 Date dateUpdated = parseMetacatDate((String)docInfo.get("date_updated"));
                 sm.setDateSysMetadataModified(dateUpdated);
+            }
             catch(Exception e)

          * @return
          * @throws McdbDocNotFoundException
          */
         public Hashtable<String, String> getDocumentInfo(String localId)
         public Hashtable<String, Object> getDocumentInfo(String localId)
             throws McdbDocNotFoundException
+        {
             Hashtable<String, String> h = new Hashtable<String, String>();
             Hashtable<String, Object> h = new Hashtable<String, Object>();
             String sql = "select docname, doctype, user_owner, user_updated, " +
                 "server_location, rev, date_created, date_updated from " +
                 "xml_documents where docid like '" + localId + "'";
-...
                     DBConnectionPool.returnDBConnection(dbConn, serialNumber);
                     throw new McdbDocNotFoundException("Could not find document " + localId);
+                }
                 String sql2 = "select principal_name, permission, perm_type, perm_order from xml_acccess " +
                 "where docid like '" + localId + "'";
                 PreparedStatement stmt2 = dbConn.prepareStatement(sql2);
                 ResultSet rs2 = stmt2.executeQuery();
                 Vector accessVector = new Vector();
                 if(rs.next())
+                {
                     Hashtable accessHash = new Hashtable();
                     String principal_name = rs.getString(1);
                     String permission = rs.getString(2);
                     String permissionType = rs.getString(3);
                     String permissionOrder = rs.getString(4);
                     accessHash.put("principal_name", principal_name);
                     accessHash.put("permission", permission);
                     accessHash.put("permission_type", permissionType);
                     accessHash.put("permission_order", permissionOrder);
                     accessVector.add(accessHash);
+                }
                 h.put("access", accessVector);
+            }
             catch (SQLException e)
+            {

     			//try to open a https stream to test if the request server's public key
     			//in the key store, this is security issue
     			String testUrl = "https://" + server + "?server="
     					+ MetacatUtil.getLocalReplicationServerName() + "&action=test";
     			System.out.println("running test: " + testUrl);
                 + MetacatUtil.getLocalReplicationServerName() + "&action=test";
     			logReplication.info("Running trust test: " + testUrl);
     			URL u = new URL(testUrl);
     			String test = ReplicationService.getURLContent(u);
     			logReplication.info("trust test returned: " + test);
     			System.out.println("trust test returned: " + test);
     			logReplication.info("Ouput from test is '" + test + "'");
     			//couldn't pass the test
     			if (test.indexOf("successfully") == -1) {
     			    logReplication.error("Trust test failed.");
     				response.setContentType("text/xml");
     				out.println("<error>Couldn't pass the trust test</error>");
     				out.close();
     				return;
+    			}
     			logReplication.info("Trust test succeeded.");
     			// Check if local host configure to replicate xml documents to remote
     			// server. If not send back a error message
-...
     	 * @throws java.io.IOException
     	 */
     	public static String getURLContent(URL u) throws java.io.IOException {
     	    logReplication.info("Getting url content from " + u.toString());
     		char istreamChar;
     		int istreamInt;
     		logReplication.info("ReplicationService.getURLContent - Before open the stream" + u.toString());

Project

General

Profile

Metacat

Revision 5441

Added by berkley almost 14 years ago