Changeset 1878

Timestamp:

04/12/12 11:52:51 (12 years ago)

Author:

gaba

Message:

htmljspage format - corrections

Location:

MDService2/branches/MDService_simple3

Files:

• WorkspaceProfile.xml (modified) (1 diff)
• src/eu/clarin/cmdi/mdservice/action/GenericAction.java (modified) (2 diffs)

MDService2/branches/MDService_simple3/WorkspaceProfile.xml

@@ -7 +7 @@
       <WorkspaceProfile user="server">
       <Repositories>
-      <item>
+      <!-- 
+       <item>
            <name>clarin.at-mirror</name>   
            <id>52</id> 
            <type>md</type>
            <uri>http://clarin.aac.ac.at/exist/rest/db/clarin/cmd-model.xql/</uri>
-        </item> 
+        </item>
+       -->
+      
     <item>
               <name>clarin.eu:mdrepo</name>

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/GenericAction.java

@@ -559 +559 @@
                         loadParams();
                         
+                        
                         setTargetProxy();
                         if (checkTargetProxy()) {
@@ -578 +579 @@
                         
                         //Caching
-                        if (getCache().equals(Cache.SKIP)) {
-                                sourceStream = getSourceStream();
-                        } else { 
-                                if (getCache().equals(Cache.USE)) {
+                        if (getFormat().equals("htmljspage")) {
+                                setSourceStream(WorkspaceProfile.createStream("htmljspage"));   
+                        } else {
+
+                                if (getCache().equals(Cache.SKIP)) {
+                                        sourceStream = getSourceStream();
+                                } else { 
+                                        if (getCache().equals(Cache.USE)) {
+                                                        sourceStream = Cache.getCache().getFromCache(req_key);
+                                        }
+                                        if (sourceStream == null) { // either not in cache or cache_flag=refresh
+                                                long startMillis = System.currentTimeMillis();
+                                                sourceStream = getSourceStream();
+                                                duration = System.currentTimeMillis() - startMillis;
+                                                req_key = addDurationKey();
+                                                String xcid = Cache.getCache().putInCache(req_key,sourceStream);                        
+                                                log.debug("putting in cache: " + req_key + ", " + xcid);                        
                                                 sourceStream = Cache.getCache().getFromCache(req_key);
+                                        } else {
+                                                log.debug("reading from cache: " + req_key);
+                                        } 
                                 }
-                                if (sourceStream == null) { // either not in cache or cache_flag=refresh
-                                        long startMillis = System.currentTimeMillis();
-                                        sourceStream = getSourceStream();
-                                        duration = System.currentTimeMillis() - startMillis;
-                                        req_key = addDurationKey();
-                                        String xcid = Cache.getCache().putInCache(req_key,sourceStream);                        
-                                        log.debug("putting in cache: " + req_key + ", " + xcid);                        
-                                        sourceStream = Cache.getCache().getFromCache(req_key);
-                                } else {
-                                        log.debug("reading from cache: " + req_key);
-                                } 
                         }
+
                         
                         // append diagnostics to sourcestream