/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 9297

Added by Jing Tao over 9 years ago

Decode the string of the uri after we break the uri into parts base on the "/".

src/edu/ucsb/nceas/metacat/restservice/D1HttpRequest.java
58	58	String strip = this.getContextPath() + this.getServletPath();
59	59	System.out.println("stripping " + strip + " from requestURI");
60	60	s = reqUri.substring(strip.length());
61		try
	61	/*try
62	62	{
63	63	s = URLDecoder.decode(s, "UTF-8");
64	64	}
65	65	catch (UnsupportedEncodingException e)
66	66	{
67	67	s = URLDecoder.decode(s);
68		}
	68	}*/
69	69	System.out.println("new pathinfo: " + s);
70	70	return s;
71	71	}
	72
72	73	}

     import java.io.InputStream;
     import java.io.OutputStream;
     import java.io.PrintWriter;
     import java.io.UnsupportedEncodingException;
     import java.net.URLDecoder;
     import java.util.Enumeration;
     import java.util.Hashtable;
     import java.util.Iterator;
-...
                         + e1.getMessage());
+            }
+        }
         /**
          * A method to decode the given string which is a part of a uri.
          * The default encoding is utf-8. If the utf-8 is not support in this system, the default one in the systme will be used.
          * @param s
          * @return null if the given string is null
          */
         public static String decode(String s) {
             String result = null;
             if(s != null) {
                 try
+                {
                     result = URLDecoder.decode(s, "UTF-8");
+                }
                 catch (UnsupportedEncodingException e)
+                {
                     result = URLDecoder.decode(s);
+                }
                 System.out.println("After decoded: " + result);
+            }
             return result;
+        }
+    }

     import edu.ucsb.nceas.metacat.dataone.v1.CNodeService;
     import edu.ucsb.nceas.metacat.properties.PropertyService;
     import edu.ucsb.nceas.metacat.restservice.D1HttpRequest;
     import edu.ucsb.nceas.metacat.restservice.D1ResourceHandler;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
-...
                         logMetacat.debug("Setting access policy");
                         // after the command
                         extra = parseTrailing(resource, RESOURCE_ACCESS_RULES);
                         extra = decode(extra);
                         setAccess(extra);
                         status = true;
                         logMetacat.debug("done setting access");
-...
                         // after the command
                         extra = parseTrailing(resource, RESOURCE_META);
                         extra = decode(extra);
                         // get
                         if (httpVerb == GET) {
                             getSystemMetadataObject(extra);
-...
                         // after the command
                         extra = parseTrailing(resource, RESOURCE_RESOLVE);
                         extra = decode(extra);
                         // resolve the object location
                         if (httpVerb == GET) {
                             resolve(extra);
-...
                         // after the command
                         extra = parseTrailing(resource, RESOURCE_OWNER);
                         extra = decode(extra);
                         // set the owner
                         if (httpVerb == PUT) {
                             owner(extra);
-...
                         // after the command
                         extra = parseTrailing(resource, RESOURCE_IS_AUTHORIZED);
                         extra = decode(extra);
                         // authorized?
                         if (httpVerb == GET) {
                             isAuthorized(extra);
-...
                         // after the command
                         extra = parseTrailing(resource, RESOURCE_OBJECTS);
                         extra = decode(extra);
                         logMetacat.debug("objectId: " + extra);
                         logMetacat.debug("verb:" + httpVerb);
-...
                         // after the command
                         extra = parseTrailing(resource, RESOURCE_FORMATS);
                         extra = decode(extra);
                         // handle each verb
                         if (httpVerb == GET) {
                             if (extra == null) {
-...
                         // handle archive events
                         if (httpVerb == PUT) {
                             extra = parseTrailing(resource, Constants.RESOURCE_ARCHIVE);
                             extra = decode(extra);
                             archive(extra);
                             status = true;
+                        }
-...
                         // after the command
                         extra = parseTrailing(resource, Constants.RESOURCE_CHECKSUM);
                         extra = decode(extra);
                         // handle checksum requests
                         if (httpVerb == GET) {
-...
                                 + RESOURCE_REPLICATION_POLICY);
                         // get the trailing pid
                         extra = parseTrailing(resource, RESOURCE_REPLICATION_POLICY);
                         extra = decode(extra);
                         setReplicationPolicy(extra);
                         status = true;
-...
                                 + RESOURCE_REPLICATION_META);
                         // get the trailing pid
                         extra = parseTrailing(resource, RESOURCE_REPLICATION_META);
                         extra = decode(extra);
                         updateReplicationMetadata(extra);
                         status = true;
-...
                                 + RESOURCE_REPLICATION_NOTIFY);
                         // get the trailing pid
                         extra = parseTrailing(resource, RESOURCE_REPLICATION_NOTIFY);
                         extra = decode(extra);
                         setReplicationStatus(extra);
                         status = true;
-...
                         // get the trailing pid
                         extra = parseTrailing(resource,
                                 RESOURCE_REPLICATION_AUTHORIZED);
                         extra = decode(extra);
                         isNodeAuthorized(extra);
                         status = true;
-...
                         if (httpVerb == GET) {
                         	// after the command
                             extra = parseTrailing(resource, Constants.RESOURCE_MONITOR_PING);
                             extra = decode(extra);
                             logMetacat.debug("processing ping request");
                             Date result = CNodeService.getInstance(request).ping();
                             // TODO: send to output
-...
                                 + Constants.RESOURCE_META_OBSOLETEDBY);
                         // get the trailing pid
                         extra = parseTrailing(resource, Constants.RESOURCE_META_OBSOLETEDBY);
                         extra = decode(extra);
                         setObsoletedBy(extra);
                         status = true;
                     } else if (resource.startsWith(Constants.RESOURCE_REPLICATION_DELETE_REPLICA)
-...
                                 + Constants.RESOURCE_REPLICATION_DELETE_REPLICA);
                         // get the trailing pid
                         extra = parseTrailing(resource, Constants.RESOURCE_REPLICATION_DELETE_REPLICA);
                         extra = decode(extra);
                         deleteReplica(extra);
                         status = true;
+                    }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 9297

Added by Jing Tao over 9 years ago