/ - Diff - Metacat - Ecoinformatics Redmine

     import edu.ucsb.nceas.metacat.service.SessionService;
     import edu.ucsb.nceas.metacat.util.SessionData;
     import com.gc.iotools.stream.is.InputStreamFromOutputStream;
     /**
      * A JUnit test for testing the dataone CrudService class
      */
-...
     	public static Test suite()
+    	{
     		TestSuite suite = new TestSuite();
     		/*suite.addTest(new CrudServiceTest("initialize"));
     		suite.addTest(new CrudServiceTest("initialize"));
     		suite.addTest(new CrudServiceTest("testSingletonAccessor"));
     		suite.addTest(new CrudServiceTest("testCreateAndGet"));
     		suite.addTest(new CrudServiceTest("testGetSystemMetadata"));
     		suite.addTest(new CrudServiceTest("testUpdate"));*/
     		suite.addTest(new CrudServiceTest("testUpdate"));
     		suite.addTest(new CrudServiceTest("testListObjects"));
     		/*suite.addTest(new CrudServiceTest("testAccessControl"));
     		suite.addTest(new CrudServiceTest("testAccessControl"));
     		suite.addTest(new CrudServiceTest("testGenerateMissingSystemMetadata"));
     		suite.addTest(new CrudServiceTest("testGetLogRecords"));
     		suite.addTest(new CrudServiceTest("testChecksumError"));
     		suite.addTest(new CrudServiceTest("testPublicAccess"));*/
     		suite.addTest(new CrudServiceTest("testPublicAccess"));
     		return suite;
+    	}
-...
+                {
                     AuthToken publicToken = new AuthToken("public");
                     data = cs.get(publicToken, id);
                     data.read();
                     fail("should have thrown an exception");
+                }
                 catch(Exception e)
+                {
                     data.close();
                     /*System.out.println("%%%%%%%%%%%%%%%%%%%%%%%getting result");
                     Object o = ((InputStreamFromOutputStream)data).getResult();
                     System.out.println("result: " + o);
                     System.out.println("exception thrown!");
                     System.out.println("exception thrown: " + e.getClass().getName());*/
+                }
                 makeDocPublic(token, id, true);
                 token = new AuthToken("public");
     	        data = cs.get(token, id);

     import javax.servlet.http.HttpServletRequest;
     import javax.servlet.http.HttpServletResponse;
     import java.text.DateFormat;
     import java.text.ParseException;
     import java.text.ParsePosition;
     import java.text.SimpleDateFormat;
-...
         private static final String FUNCTION_NAME_UPDATE = "update";
         private static final String FUNCTION_NAME_GENERATE_MISSING_SYSTEM_METADATA = "generatemissingsystemmetadata";
         private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
         private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
         private ServletContext servletContext;
         private Logger logMetacat;
-...
+                        {
                             try
+                            {
                               startTime = dateFormat.parse(value[0]);
                               //startTime = dateFormat.parse(value[0]);
                                 startTime = parseDateAndConvertToGMT(value[0]);
+                            }
                             catch(Exception e)
                             {  //if we can't parse it, just don't use the startTime param
-...
+                        {
                             try
+                            {
                               endTime = dateFormat.parse(value[0]);
                               //endTime = dateFormat.parse(value[0]);
                                 endTime = parseDateAndConvertToGMT(value[0]);
+                            }
                             catch(Exception e)
                             {  //if we can't parse it, just don't use the endTime param
-...
                 serializeException(sf, out);
+            }
+        }
         /**
          * parse a date and return it in GMT if it ends with a 'Z'
          * @param date
          * @return
          * @throws ParseException
          */
         private Date parseDateAndConvertToGMT(String date) throws ParseException
+        {
             System.out.println("Parsing date " + date);
             Date d = dateFormat.parse(date);
             if(date.endsWith("Z"))
+            {
                 Calendar lTime = Calendar.getInstance();
                 lTime.setTime(d);
                 Calendar zTime = Calendar.getInstance(TimeZone.getTimeZone("GMT-0"));
                 zTime.set(Calendar.MONTH, lTime.get(Calendar.MONTH));
                 zTime.set(Calendar.DATE, lTime.get(Calendar.DATE));
                 zTime.set(Calendar.YEAR, lTime.get(Calendar.YEAR));
                 zTime.set(Calendar.HOUR, lTime.get(Calendar.HOUR));
                 zTime.set(Calendar.MINUTE, lTime.get(Calendar.MINUTE));
                 zTime.set(Calendar.SECOND, lTime.get(Calendar.SECOND));
                 System.out.println("date parsed to " + zTime.getTime());
                 return zTime.getTime();
+            }
             System.out.println("date parsed, but not converted. returned as " + d);
             return d;
+        }
         /**
          * Implements REST version of DataONE CRUD API --> getSystemMetadata

         private String metacatUrl;
         private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss'Z'");
         private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssZ");
         /**
          * singleton accessor
-...
                           dateSMM = dateSMM.substring(0, dateSMM.indexOf(".")) + 'Z';
+                      }
                       //System.out.println("dateSMM: " + dateSMM);
                       dateFormat.setTimeZone(TimeZone.getTimeZone("GMT-0"));
                       dateSysMetadataModified = dateFormat.parse(dateSMM);
                       //System.out.println("dateSysMetadataModified: " + dateSysMetadataModified);
                       //dateSysMetadataModified = getDateInTimeZone(dateSysMetadataModified, TimeZone.getDefault().getID());
                       //System.out.println("dateSysMetadataModified after convertion to default timezone: " + dateSysMetadataModified);
                       //dateFormat.setTimeZone(TimeZone.getTimeZone("GMT-0"));
                       try
                       {   //the format we want
                           dateSysMetadataModified = dateFormat.parse(dateSMM);
+                      }
                       catch(java.text.ParseException pe)
                       {   //try another legacy format
                           DateFormat dateFormat2 = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss'Z'");
                           dateFormat2.setTimeZone(TimeZone.getTimeZone("GMT-0"));
                           dateSysMetadataModified = dateFormat2.parse(dateSMM);
+                      }
+                  }
                   /*System.out.println("docid: " + d.docid);
                   System.out.println("dateSysMetadataModified: " + dateSysMetadataModified);
                   System.out.println("startTime: " + startTime);
-...
               docs = docCopy;
               totalAfterQuery = docs.size();
               System.out.println("total after subquery: " + totalAfterQuery);
               //System.out.println("total after subquery: " + totalAfterQuery);
               //make sure we don't run over the end
               int end = start + count;
-...
           EventLog.getInstance().log(metacatUrl,
                   username, null, "read");
           logCrud.info("listObjects");
           //System.out.println("ol.size: " + ol.sizeObjectInfoList());
           ol.setCount(count);
           ol.setStart(start);
           ol.setTotal(totalAfterQuery);
           System.out.println("returning " + ol.sizeObjectInfoList() + " items in the object list");
           return ol;
+        }
-...
                         return "Completed";
+                    }
                 };
                 System.out.println("1");
                 String username = sessionData.getUserName();
                 EventLog.getInstance().log(metacatUrl,
                         username, im.getLocalId(guid.getValue()), "read");
-...
             System.out.println("****inserting new system metadata with modified date " + sysmeta.getDateSysMetadataModified());
             String xml = new String(serializeSystemMetadata(sysmeta).toByteArray());
             //System.out.println("sysmeta: " + xml);
             String localId = insertDocument(xml, sysMetaGuid, sessionData);
             System.out.println("sysmeta inserted with localId " + localId);
             //insert the system metadata doc id into the identifiers table to
-...
+            }
             catch(Exception e)
+            {
                 System.out.println("couldn't parse a date: " + e.getMessage());
                 System.out.println("POSSIBLE ERROR: couldn't parse a date: " + e.getMessage());
                 Date dateCreated = new Date();
                 sm.setDateUploaded(dateCreated);
                 Date dateUpdated = new Date();

Project

General

Profile

Metacat

Revision 5428

Added by berkley over 14 years ago