/ - Diff - Metacat - Ecoinformatics Redmine

     import java.security.MessageDigest;
     import edu.ucsb.nceas.MCTestCase;
     import edu.ucsb.nceas.metacat.IdentifierManager;
     import edu.ucsb.nceas.metacat.client.MetacatAuthException;
     import edu.ucsb.nceas.metacat.client.MetacatException;
     import edu.ucsb.nceas.metacat.client.MetacatInaccessibleException;
-...
     	        CrudService cs = CrudService.getInstance();
     	        AuthToken token = getToken();
     	        ObjectFormat of1 = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0");
     	        ObjectFormat of2 = ObjectFormat.convert("text/plain");
     	        ObjectFormat of2 = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.0.0");
     	        //create docs at different times
     	        Date d1 = new Date();
     	        Identifier id1 = createDoc(token, getTestDoc(), of1);
-...
+    	    }
     	    catch(Exception e)
+    	    {
     	        //e.printStackTrace();
     	        fail("Error in listObjects: " + e.getMessage());
+    	    }
+    	}
-...
     	        AuthToken token = getToken();
     	        //run create
     	        Identifier id = createDoc(token, getTestDoc());
     	        //make these docs public for debugging purposes.
     	        makeDocPublic(id, true);
                 //compare the docs
                 String gotDoc = getDoc(token, id);
                 assertTrue(gotDoc.trim().equals(getTestDoc().trim()));
-...
+    	}
     	/**
     	 *  make a document public in metacat by inserting an access document
     	 * @param id
     	 */
     	private void makeDocPublic(Identifier id, boolean systemMetadataToo)
     	  throws Exception
+    	{
     	    CrudService cs = CrudService.getInstance();
     	    IdentifierManager im = IdentifierManager.getInstance();
     	    cs.setAccess(getToken(), id, "public", "read", "allow", "allowFirst");
     	    if(systemMetadataToo)
+    	    {
     	        String smidS = im.getSystemMetadataId(id.getValue());
     	        Identifier smid = new Identifier();
     	        smid.setValue(smidS);
     	        cs.setAccess(getToken(), smid, "public", "read", "allow", "allowFirst");
+    	    }
+    	}
     	/**
     	 * print a header to start each test
     	 */
     	private void printTestHeader(String testName)

     import java.io.OutputStreamWriter;
     import java.io.PrintWriter;
     import java.io.StringReader;
     import java.io.ByteArrayOutputStream;
     import java.io.Writer;
     import java.net.MalformedURLException;
     import java.net.URL;
-...
                     csv.flush();
                     response.flushBuffer();
                     rs.close();
                 } catch (SQLException e) {
-...
+            }
+        }
         /**
+         *
          * @return
          */
         public void query(String metacatUrl, PrintWriter out, Hashtable<String, String[]>params,
                 String username, String[] groups, String sessionid)
           throws Exception
+        {
             handleQuery(out, params, null, username, groups, sessionid);
+        }
         /**
          * set the access permissions on the document specified
          */
         public void setAccess(String metacatUrl, String username, String docid, String principal,
                 String permission, String permissionType, String permissionOrder)
           throws Exception
+        {
             Hashtable<String,String[]> params = new Hashtable();
             params.put("principal", new String[] {principal});
             params.put("permission", new String[] {permission});
             params.put("permType", new String[] {permissionType});
             params.put("permOrder", new String[] {permissionOrder});
             params.put("docid", new String[]{docid});
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             PrintWriter out = new PrintWriter(baos);
             handleSetAccessAction(out, params, username, null, null);
             System.out.println("Set acces to " + permission + " for document " + docid);
+        }
         /** read metadata or data from Metacat
          * @throws PropertyNotFoundException
          * @throws ParseLSIDException

           if (qformat != null && qformat.equals(MetacatUtil.XMLFORMAT))
+          {
             //xml format
             response.setContentType("text/xml");
             createResultDocument(xmlquery, qspec, out, user, groups, useXMLIndex,
             if(response != null)
                 response.setContentType("text/xml");
             StringBuffer sb = createResultDocument(xmlquery, qspec, out, user, groups, useXMLIndex,
               pagesize, pagestart, sessionid);
             System.out.println("result from createResultDocument: " + sb.toString());
           }//if
           else
+          {

+        }
         /**
          * set the permission on the document
          * @param token
          * @param principal
          * @param permission
          * @param permissionType
          * @param permissionOrder
          * @return
          */
         public void setAccess(AuthToken token, Identifier id, String principal, String permission,
                 String permissionType, String permissionOrder)
           throws ServiceFailure
+        {
             try
+            {
                 IdentifierManager im = IdentifierManager.getInstance();
                 String docid = im.getLocalId(id.getValue());
                 final SessionData sessionData = getSessionData(token);
                 String permNum = "0";
                 if(permission == "read")
+                {
                     permNum = "4";
+                }
                 else if(permission == "write")
+                {
                     permNum = "6";
+                }
                 handler.setAccess(metacatUrl, sessionData.getUserName(), docid,
                         principal, permNum, permissionType, permissionOrder);
+            }
             catch(Exception e)
+            {
                 throw new ServiceFailure("1000", "Could not set access on the document with id " + id.getValue());
+            }
+        }
         /**
          *  Retrieve the list of objects present on the MN that match the calling
          *  parameters. This method is required to support the process of Member
          *  Node synchronization. At a minimum, this method should be able to
-...
           throws NotAuthorized, InvalidRequest, NotImplemented, ServiceFailure, InvalidToken
+        {
           ObjectList ol = new ObjectList();
           //do an squery on metacat to return systemMetadata docs where
           //sm.dateSysMetadataModified >= startTime
           //sm.dateSysMetadataModified <= endTime
           //further slice the returned dataset if replicaStatus is false.
           //if start != 0, return only the documents with index >= start
           //if the number of results is > count, return the first count docs
           final SessionData sessionData = getSessionData(token);
           try
+          {
               params.clear();
               params.put("returndoctype", new String[] {"http://dataone.org/service/types/SystemMetadata/0.1"});
               params.put("qformat", new String[] {"xml"});
               //params.put("returnvalue", new String[] {"dateSysMetadataModified", "identifier", "objectFormat"});
               //params.put("casesensitive", new String[] {"false"});
               params.put("anyfield", new String[] {"%"});
               ByteArrayOutputStream baos = new ByteArrayOutputStream();
               PrintWriter out = new PrintWriter(baos);
               System.out.println("listing objects");
               handler.query(metacatUrl, out, params, sessionData.getUserName(),
                       sessionData.getGroupNames(), sessionData.getId());
               baos.close();
               System.out.println("result from query: " + baos.toString());
               //do an squery on metacat to return systemMetadata docs where
               //sm.dateSysMetadataModified >= startTime
               //sm.dateSysMetadataModified <= endTime
               //further slice the returned dataset if replicaStatus is false.
               //if start != 0, return only the documents with index >= start
               //if the number of results is > count, return the first count docs
+          }
           catch(Exception e)
+          {
               e.printStackTrace();
               throw new ServiceFailure("1580", "Error retrieving ObjectList: " + e.getMessage());
+          }
           return ol;
+        }

Project

General

Profile

Metacat

Revision 5362

Added by berkley almost 14 years ago