Changeset 1129 for MDService2/trunk

Timestamp:

02/17/11 10:47:33 (13 years ago)

Author:

vronk

Message:

 

Location:

MDService2/trunk/MDService2

Files:

• WebContent/static/data.xml (modified) (1 diff)
• WebContent/static/welcome.xml (modified) (1 diff)
• src/eu/clarin/cmdi/mdservice/action/TermsProxyAction.java (modified) (1 diff)

MDService2/trunk/MDService2/WebContent/static/data.xml

@@ -21 +21 @@
                         <li>at <strong>ICLTT, Vienna</strong>:
                                 <ul>
-                                        <li>by <a href="/MDService2/collections/htmlpage?maxdepth=3" >Collections</a></li>
-                                        <li>by <a href="/MDService2/terms/htmlpage/?q=all" >Profiles</a></li>
+                                        <li>by <a href="/MDService2/collections/htmlpage?maxdepth=3&amp;repository=1" >Collections</a></li>
+                                        <li>by <a href="/MDService2/terms/htmlpage/?q=all&amp;repository=1" >Profiles</a></li>
                                 </ul>   
                         </li>

MDService2/trunk/MDService2/WebContent/static/welcome.xml

@@ -17 +17 @@
                         it is still demo-quality and cannot yet be seen and used as reliable service.
                         Lot of work is still needed both on the data quality and user interface.</p>
-                        <p>Especially there are plans for a substantial rework of the user-interface in the coming month, based on feedback at CMDI-Workshop in Nijmegen 2011-01-17, next to continuous integration of new datasets (provided for harvesting by the <a href="http://www.clarin.eu/centres" >CLARIN centres)</a>.</p>
+                        <p>Especially there are plans for a substantial rework of the user-interface in the coming month, based on feedback at CMDI-Workshop in Nijmegen 2011-01-17, next to continuous integration of new datasets (provided for harvesting by the <a href="http://www.clarin.eu/centres" >CLARIN centres</a>).</p>
                         <p>Nevertheless we invite you to try it out and look forward to any critical remarks at: cmdi_at_clarin_dot_eu</p> 
                 </div>

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

@@ -119 +119 @@
                 URL targetURL = null;
                 //targetURL = new URL(getBaseURI() + getQ());
-                Admin.notifyUser("TPA.q: " + getBaseURI() + getQ() + getRepository());          
+                Admin.notifyUser("TPA.q: " + getBaseURI() + getQ() + getRepository());
+                // FIXME: this looks like an ugly hack!
+                if (getMaxdepth()==0)  setMaxdepth(1);
                 targetURL = new URL(getBaseURI() + getQ() + "&maxdepth=" + getMaxdepth() + "&repository=" + getRepository());
                 // TPA.targetURL:http://localhost:8080/MDService2/model/matrix/?q=all