Changeset 1076 for MDService2/trunk/MDService2/WebContent

Timestamp:

01/16/11 15:17:34 (13 years ago)

Author:

vronk

Message:

reduced logging messages,
changes to CQL-handling in js and XCQL2Xpath-mapping;
reworked docs, introduced example queries

Location:

MDService2/trunk/MDService2/WebContent

Files:

• index.jsp (modified) (1 diff)
• scripts/mdservice_helpers.js (modified) (1 diff)
• scripts/mdservice_model.js (modified) (2 diffs)
• static/MDBrowser_explained_5_resize2000.png (added)
• static/MDBrowser_explained_5_resize800.png (added)
• static/info.xml (modified) (5 diffs)
• static/queries.xml (added)
• style/cmds-ui.css (modified) (2 diffs)

MDService2/trunk/MDService2/WebContent/index.jsp

@@ -36 +36 @@
                                         <% if ( request.getRemoteUser() == null) {  %> 
                                         <a href="workspace.jsp" >    login</a>
-                                        <a href="static/MDBrowser_explained_5_resize.png" > docs</a>
+                                        <a href="docs/htmlpage/info" > docs</a>
                                         
                                         <% } else {  %> 

MDService2/trunk/MDService2/WebContent/scripts/mdservice_helpers.js

@@ -8 +8 @@
         $(elems).children('.header').addClass('ui-widget-header ui-state-default ui-corner-top');
         $(elems).children('.content').addClass('ui-widget-content ui-corner-bottom');
-        $(elems).children('.header').click(function() {
+/*      $(elems).children('.header').click(function() {
                 $(this).next().toggle('fast');
                 return false;
         }).next().hide();
-        
-        
+        */
+        $(elems).children('.header').append('<span class="cmd cmd-collapse cmd_down" > </span>');
+        $(elems).find('.cmd-collapse').click(function(event) {
+                        $(this).closest('.header').next().toggle('fast');
+                        $(this).toggleClass('cmd_down cmd_up');
+                        return false;
+                });
         
         $(elems).each(function(i) {
                 if ($(this).hasClass('init-show'))  {           
                         $(this).children('.content').show();
+                        $(this).find('.cmd-collapse').toggleClass('cmd_down cmd_up');           
                 }
                 if ($(this).parent().hasClass('cmds-ui-closable'))  {           

MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js

@@ -108 +108 @@
 };
 
+/** special handling for special characters: double escaping (escape the %-sign)
+ * to survive the %-encoding through the request (and parsing) down to the transformation in XCQL2XPath.xsl
+ * it's: whitespace, and single and double-quotes (unified to double quotes %22)
+*/  
+
 Query.prototype.query_uri = function () {
         var params = "?";
@@ -114 +119 @@
         }
         if (this.squery != null) {
-                params = params + "squery=" + escape(this.squery).replace("%20","%2520") + "&";
+                escaped_sq =escape(this.squery).replace(/%20/g,"%2520").replace(/\%2[27]/g,"%2522") ;
+                escaped_sq = escaped_sq.replace(/%7C/g,"%257C").replace(/\+/g,"%2B"); 
+                params = params + "squery=" + escaped_sq + "&";
         }
         params = params + "collection=" + this.getcollectiontext("index") + "&columns=" + this.getcolumnstext() + "&startItem=" + this.startItem + "&maximumItems=" + this.maximumItems + "&repository=" + this.repository;

MDService2/trunk/MDService2/WebContent/static/info.xml

@@ -1 +1 @@
 <info xml:lang="en" >
+        <div id="title">Information</div>
         <div id="welcome">
         
@@ -8 +9 @@
                 <li>browse the collections</li>
                 <li>try one of the sample queries</li>
-                <li>provide complex boolean-searches  by profiles</li>
+                <li>perform complex boolean-searches</li>
                 <li>search by profiles</li>
                 <li>search by data categories</li>
@@ -22 +23 @@
         <p>Overview of current data set:
         <ul>
-                <li>by Collections</li>
-                <li>by Profiles</li>
+                <li>by <a href="/MDService2/collections/htmlpage" >Collections</a></li>
+                <li>by <a href="/MDService2/terms/htmlpage/?q=all" >Profiles</a></li>
         </ul>
-        </p>
-        
+        </p>    
+        </div>
+        <div>
+                <span class="title">Overview</span>
+                <p>Overview and explanation of usage of individual elements of the user-interface</p>           
+                <a href="/MDService2/static/MDBrowser_explained_5_resize2000.png" >
+                        <img src="/MDService2/static/MDBrowser_explained_5_resize800.png" title="MDBrowser explained2" /></a>   
         </div>
         <div id="serverqs-info">
@@ -36 +42 @@
                 <span class="title">Personalized workspace - commons</span>
                 <p>when logged in, you can store your queries and bookmarks here.</p>
-                <p>All anonymous user share the default workspace.</p>
+                <p>All anonymous users share the default workspace.</p>
         </div>
         <div id="collections-info">
+                <span class="title">Collections</span>
                 <p>Overview of collections=datasets available in the repository</p>
         </div>
         <div id="terms-info">
+                <span class="title">Terms</span>
                 <p>Terms combines information from MDRepository, ComponentRegistry, Datacategory Registries (isocat, dublincore) and Relationregistry to allow to search by profiles or data categories, or even perform semantic search</p>
-                <p>You can search in he fields of individual profiles used by the MDrecords in the repository, or search over multiple profiles via datacategories</p>
+                <p>You can search in the fields of individual profiles instantiated as the MDrecords in the repository, or search over multiple profiles via datacategories.</p>
         </div>  
         <div id="compreg-info">
-                <p>Overview of  </p>
+                <span class="title" >Component Registry</span>
+                <p>Overview of all profiles and components defined in the Component Registry</p>
         </div>
         <div id="query-input-info">
-
+                <span class="title" >Query Input</span>
+                <p>Form for entering the query. Either a simple or complex query</p>
+                <p>Both parts can be used in parallel: i.e. you can specify some terms for full-text search
+                and further refine them with.
+                The two parts are combined with boolean AND (the matching records have to satisfy both parts of the query.)
+                See <a href="queries" >example queries</a> for an overview of possible query types.
+                </p>
                 <div id="input-simplequery-info">
-                                        <p>simple full-text search: individual terms, multiple terms, phrases(not yet)</p>
+                        <p>simple full-text search: individual terms, multiple terms, phrases</p>
+                </div>
+                <div d="searchclauselist-info">
+                        <p>complex queries according to SRU/CQL-standard</p>
+                        <p>Basic <em>search clause</em> consists of: <code>index relation term</code>, e.g. <code>dc.title any system</code>.
+                        You can combine this search clauses with boolean operators (AND, OR), to more complex queries</p>
                 </div>
         </div>  
@@ -58 +78 @@
         
         <div id="commands" >
+        <span class="title">Commands</span>
+        <p>List of commands available in the user-interface, explanation of their function:</p>
         <dt id="cmd_add">Add new item</dt> 
         <dt id="cmd_add_and">Add an additional condition (AND)</dt> 

MDService2/trunk/MDService2/WebContent/style/cmds-ui.css

@@ -124 +124 @@
 .columns-selected { }
 
+/* documentation */
+.title, h1, h2, h3 { color: #014172;}
+h1 {font-size: 1.6em;}
+h2 {font-size: 1.4em;}
+h3 {font-size: 1.2em;}   
+.title {font-size: 1.2 em; font-weight: bold; margin: 1em 0 0 0.2em;}
+dt { padding: 1em 0 0.2em 1.5em; font-weight: bold;}
+dd { padding-left: 2.5em; display:block;}
+.info p { margin: 0.2em 0; }
+
 /* ************* */
 /* tooltip */
@@ -133 +143 @@
  background:#A6C9E2;
  color:#000;
- }
-
+}
 
 /* command icons */