Changeset 862 for MDService2/trunk/MDService2/src/eu/clarin/cmdi

Timestamp:

11/09/10 10:27:07 (14 years ago)

Author:

vronk

Message:

many small corrections (optics), dynamic repository resolution for Terms

Location:

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action

Files:

• CollectionProxyAction.java (modified) (1 diff)
• GenericProxyAction.java (modified) (3 diffs)
• TermsProxyAction.java (modified) (1 diff)

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/CollectionProxyAction.java

@@ -33 +33 @@
                 URL targetURL = null;
                 //targetURL =new URL( getBaseURL(), getActionkey());
-                targetURL = new URL(getBaseURL(), "?operation=getCollections&collection=");
+                //FIXME: get maxdepth-constant out of here !!
+                targetURL = new URL(getBaseURL(), "?operation=getCollections&maxdepth=3&collection=");
                 //Admin.notifyUser("CollectionProxy.targetURL:" + targetURL);
 

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java

@@ -56 +56 @@
         private String format;
         private String userMsg;
-        private int repository;
+        private int repository=1;
         //private Map<String,Object> session;
          private HttpServletRequest request; 
@@ -136 +136 @@
         
         public int getRepository() {
+                //default repository = 1 (set on init)
+                
                 return repository;
         }
@@ -457 +459 @@
                         // set URL as srcFile (for MDTransformer to pass to xsl-scripts) 
                         MDTransformer.getMDTransformer().setSrcFile(getTargetRequest());
-                        resultStream = MDTransformer.getMDTransformer().transformXML(sourceStream, getFullFormat(), getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(),getRepositoryPath());
+                        // getColumns
+                        Admin.notifyUser("GPA.getRepository, before xsl:" + getRepository());
+                        resultStream = MDTransformer.getMDTransformer().transformXML(sourceStream, getFullFormat(), getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(),String.valueOf(getRepository()));
                 }
                         

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/TermsProxyAction.java

@@ -108 +108 @@
                 //targetURL = new URL(getBaseURI() + getQ());
                 Admin.notifyUser("TPA.q: " + getBaseURI() + getQ() + getRepository());          
-                targetURL = new URL(getBaseURI() + getQ() + "&repository=" + getRepository());
+                targetURL = new URL(getBaseURI() + getQ() + "&maxdepth=" + getMaxdepth() + "&repository=" + getRepository());
                 // TPA.targetURL:http://localhost:8080/MDService2/model/matrix/?q=all
             return targetURL;