/ - Diff - Metacat - Ecoinformatics Redmine

                                 //System.out.println("done setting access");
+                            }
                         } else if (resource.equals(RESOURCE_META)) {
                             if(params.get(FUNCTION_KEYWORD)[0].equals(FUNCTION_NAME_GENERATE_MISSING_SYSTEM_METADATA))
                             if(params != null && params.get(FUNCTION_KEYWORD) != null &&
                                params.get(FUNCTION_KEYWORD)[0].equals(FUNCTION_NAME_GENERATE_MISSING_SYSTEM_METADATA))
                             { //generate system metadata for any object that is
                               //a) not system metadata itself
                               //b) does not already have a system metadata id in the systemmetadata table
-...
             while (paramlist.hasMoreElements()) {
                 name = (String) paramlist.nextElement();
                 value = request.getParameterValues(name);
                 //System.out.println("adding param: " + name + " = " + value);
                 params.put(name, value);
+            }
+        }
         /**
-...
                     password = sessionData.getPassword();
                     groupNames = sessionData.getGroupNames();
                     sessionId = sessionData.getId();
                     //System.out.println("setting sessionid to " + sessionId);
                     System.out.println("setting sessionid to " + sessionId);
                     System.out.println("username: " + username);
+                }
                 //if the session is not valid or the username is null, set
                 //username to public
                 if (username == null)
+                {
                     System.out.println("setting username to public.");
                     username = "public";
+                }
+            }
-...
         private void getSystemMetadataObject(String guid) {
             CrudService cs = CrudService.getInstance();
             cs.setParamsFromRequest(request);
             AuthToken token = null;
             AuthToken token = new AuthToken(sessionId);
             OutputStream out = null;
             try {
                 out = response.getOutputStream();
-...
          */
         private void putObject(String guid, String action) {
             logMetacat.debug("Entering putObject: " + guid + "/" + action);
             // TODO: This function lacks proper handling of authz and authn, so it
             // seems that anyone can insert or update; interacts with
             // loadSessionData(), which doesn't validate the session
             // Get an output stream for handling errors; this should really be passed in as
             // a parameter
             OutputStream out = null;
             try {
                 out = response.getOutputStream();
-...
+                    }
                     logMetacat.debug("Commence creation...");
                     AuthToken token = null;
                     IBindingFactory bfact =
                         BindingDirectory.getFactory(SystemMetadata.class);
                     IUnmarshallingContext uctx = bfact.createUnmarshallingContext();
                     SystemMetadata m = (SystemMetadata) uctx.unmarshalDocument(sysmeta, null);
                     CrudService cs = CrudService.getInstance();
                     AuthToken token = new AuthToken(sessionId);
                     cs.setParamsFromRequest(request);
                     Identifier id = new Identifier();
                     id.setValue(guid);
                     cs.create(token, id, object, m);
                 } else if (action.equals(FUNCTION_NAME_UPDATE)) { //handle updates
                     IdentifierManager im = IdentifierManager.getInstance();
                     CrudService cs = CrudService.getInstance();
                     Identifier obsoletedGuid = new Identifier();
                     Identifier id = new Identifier();
                     id.setValue(guid);
                     AuthToken token = null;
                     AuthToken token = new AuthToken(sessionId);
                     //do some checks
                     if(params.get("obsoletedGuid") == null)

                         + " which has username" + session.getAttribute("username")
                         + " into hash in login method");
                 try {
                     System.out.println("registering session with id " + id);
                     System.out.println("username: " + (String) session.getAttribute("username"));
                     SessionService.getInstance().registerSession(id,
                             (String) session.getAttribute("username"),
                             (String[]) session.getAttribute("groupnames"),
                             (String) session.getAttribute("password"),
                             (String) session.getAttribute("name"));
                 } catch (ServiceException se) {
                     String errorMsg = "MetacatServlet.handleLoginAction - service problem registering session: "
                             + se.getMessage();

             // For Metadata and Data, insert the system metadata into the object store too
             insertSystemMetadata(sysmeta, sessionData);
             logMetacat.debug("Returning from CrudService.create()");
             EventLog.getInstance().log(metacatUrl,
                     username, localId, "create");
-...
             // Retrieve the session information from the AuthToken
             // If the session is expired, then the user is 'public'
             final SessionData sessionData = getSessionData(token);
             // TODO: Check access control rules
             try {
                 IdentifierManager im = IdentifierManager.getInstance();
-...
                         // if the localId is not acceptable or other untoward things happen
                         try {
                             logMetacat.debug("Registering document...");
                             System.out.println("inserting data object: localId: " + localId);
                             DocumentImpl.registerDocument(localId, "BIN", localId,
                                     username, groups);
                             logMetacat.debug("Registration step completed.");

Project

General

Profile

Metacat

Revision 5386

Added by berkley over 14 years ago