Changeset 1558 for MDService2
- Timestamp:
- 09/26/11 20:22:46 (13 years ago)
- Location:
- MDService2/branches/MDService_simple3
- Files:
-
- 1 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_helpers.js
r1260 r1558 147 147 if (params){ 148 148 if ( ! $.isArray(params)) { 149 l += '/' + params; 149 //l += '/' + params; 150 l += params; 150 151 } else { 151 152 l += '?' + $.param(params); -
MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_model.js
r1496 r1558 232 232 233 233 //pazpar 234 234 235 this.pz2 = new md_pz2( { "onshow": this.pazpar2show, 235 236 "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way … … 244 245 //"onrecord": my_onrecord 245 246 } ); 247 246 248 }; 247 249 Query.prototype.pazpar2show = function(data, activeClients){ … … 439 441 Query.prototype.query_uri = function () { 440 442 var params = "?"; 441 if (this.query != null) {442 params = params + "q=" + escape(this.query) + "&";443 }443 //if (this.query != null) { 444 // params = params + "q=" + escape(this.query) + "&"; 445 //} 444 446 if (this.squery != null) { 445 447 escaped_sq =escape(this.squery).replace(/%20/g,"%2520").replace(/\%2[27]/g,"%2522") ; 446 448 escaped_sq = escaped_sq.replace(/%7C/g,"%257C").replace(/\+/g,"%2B"); 447 params = params + "squery=" + escaped_sq + "&"; 448 } 449 params = params + "collection=" + this.getcollectiontext("index") + "&columns=" + this.getcolumnstext() + "&startItem=" + this.startItem + "&maximumItems=" + this.maximumItems + "&repository=" + this.repository; 449 //params = params + "squery=" + escaped_sq + "&"; 450 params = params + "query=" + escaped_sq + "&"; 451 } 452 params = params + "collection=" + this.getcollectiontext("index") + "&columns=" + this.getcolumnstext() + "&startRecord=" + this.startItem + "&maximumRecords=" + this.maximumItems + "&repository=" + this.repository; 450 453 if (this.options != null) { 451 454 params = params + "&options=withSummary"; … … 807 810 // uri = link('sru',this.sruquery_uri()); 808 811 //} else { 809 uri = link(' recordset',type, this.query_uri());812 uri = link('search', type, this.query_uri()); 810 813 // } 811 814 } … … 849 852 // ALL types = query uri, 850 853 // pazpar server usage 851 uri = link(' recordset',this.format, this.query_uri());854 uri = link('search',this.format, this.query_uri()); 852 855 853 856 /* … … 903 906 } 904 907 if (reptype=="md" ){ 905 uri = link(' recordset',this.format, this.query_uri());908 uri = link('search',this.format, this.query_uri()); 906 909 } else { 907 910 if (reptype=="sru"){ -
MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_ui.js
r1435 r1558 36 36 //loadQueryFromUriParams(); 37 37 // create widgets 38 columns_widget = new ListWidget($('#columns-widget'), "columns"); 39 collections_widget = new ListWidget($('#collections-widget'), "collections"); 40 listwidgetset.add(columns_widget); 41 listwidgetset.add(collections_widget); 42 //createInfos(); 38 39 columns_widget = new ListWidget($('#columns-widget'), "columns"); 40 collections_widget = new ListWidget($('#collections-widget'), "collections"); 41 listwidgetset.add(columns_widget); 42 listwidgetset.add(collections_widget); 43 createInfos(); 43 44 44 45 //////////// LOAD DATA … … 1042 1043 url = local_uri; 1043 1044 } 1045 //TODO new params 1044 1046 var q = url["q"]; 1045 var squery = url[" squery"];1047 var squery = url["query"];//url["squery"]; 1046 1048 var collection = url["collection"]; 1047 1049 var startItem = url["startItem"]; -
MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_ui_detail.js
r1429 r1558 75 75 if (this.detailwidget == undefined){ 76 76 if (this.url == undefined) { 77 this.url = '/MDService2/docs/xml/welcome #welcome'; 77 this.url = '/MDService2/static/welcome.xml'; 78 //this.url = '/MDService2/docs/xml/welcome #welcome'; 78 79 } 79 80 if (this.url == null) { 80 this.url = '/MDService2/docs/xml/welcome #welcome'; 81 this.url = '/MDService2/static/welcome.xml'; 82 //this.url = '/MDService2/docs/xml/welcome #welcome'; 81 83 } 82 84 -
MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_ui_load.js
r1467 r1558 48 48 $('#qts_input').val(""); 49 49 50 $.ajaxSetup({"error":function(XMLHttpRequest,textStatus, errorThrown) { 51 alert(textStatus); 52 alert(errorThrown); 53 alert(XMLHttpRequest.responseText); 54 }}); 55 56 57 50 58 // USER WORKSPACEPROFILE 51 jQuery.getJSON("/MDService2/workspaceprofile/ user",function(data){59 jQuery.getJSON("/MDService2/workspaceprofile/json/user",function(data){ 52 60 notifyUser(data['WorkspaceProfile'],'debug'); 53 61 workspace.user_json = preprocessJSON(data); 54 62 55 jQuery.getJSON("/MDService2/workspaceprofile/ server",function(data){63 jQuery.getJSON("/MDService2/workspaceprofile/json/server",function(data){ 56 64 notifyUser(data['WorkspaceProfile'],'debug'); 57 65 var json = preprocessJSON(data); … … 64 72 loadTerms(); 65 73 loadTermsAutocomplete(); 74 loadQueryFromUriParams(); 66 75 createTooltip(null); 67 76 -
MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_ui_settings.js
r1472 r1558 52 52 /* current:'cmdi-corpus-aac2'}, */ 53 53 54 recordset: {55 base_uri: "/MDService2/ recordset/"54 search: { 55 base_uri: "/MDService2/search/" 56 56 }, 57 57 -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/GenericAction.java
r1554 r1558 279 279 params.put(key, sarr); 280 280 } 281 282 /** 283 * Set parameter in local parameter map. 284 * 285 * @param key - parameter key 286 * @param value - parameter value 287 */ 288 public void setParam(String key, String value){ 289 addParam(key, value); 290 } 291 281 292 /** 282 293 * Reads in all the parameters of the request into an internal structure. … … 325 336 // TODO xslt param is q, server param is query (query=q) 326 337 327 if ( params.get("query") == null){328 addParam("query",getQ());329 } else {330 setQ(getQuery());331 }332 338 if (getQ() != null) { 333 339 addParam("q",getQ()); 340 addParam("query",getQ()); 334 341 } 335 342 -
MDService2/branches/MDService_simple3/src/struts.xml
r1540 r1558 55 55 </action> 56 56 57 <action name="indexjs" class="eu.clarin.cmdi.mdservice.action.StaticAction" method="execute"> 58 <param name="actionkey">static</param> 59 <param name="format">htmlpage</param> 60 <param name="q">indexjs</param> 61 <result type="stream"> 62 <param name="contentType">${getActionContentType()}</param> 63 <param name="inputName">resultStream</param> 64 </result> 65 </action> 57 66 <action name="catchall" class="eu.clarin.cmdi.mdservice.action.StaticAction" method="execute"> 58 67 <param name="actionkey">static</param> -
MDService2/branches/MDService_simple3/src/xsl/cmd_functions.xsl
r1554 r1558 19 19 <xsl:variable name="terms_flat" select="document($terms_flat_uri)" /> 20 20 21 <!-- TODO discuss test of use javascript , q, query ?--> 22 <xsl:variable name="use_javascript"> 23 <xsl:choose> 24 <xsl:when test="$q='indexjs'"><xsl:value-of select="1"/></xsl:when> 25 <xsl:otherwise><xsl:value-of select="0"/>"</xsl:otherwise> 26 </xsl:choose> 27 </xsl:variable> 21 28 22 29 <!-- params for include-processing … … 234 241 </xsl:function> 235 242 243 <xsl:function name="my:formURLparams" > 244 <xsl:param name="url" /> 245 <xsl:param name="query" /> 246 <xsl:param name="repository" /> 247 <xsl:param name="startRecord" /> 248 <xsl:param name="maximumRecords" /> 249 250 <xsl:variable name="param_query"> 251 <xsl:if test="$query != ''"> 252 <xsl:value-of select="concat('query=',$query)"></xsl:value-of> 253 </xsl:if> 254 </xsl:variable> 255 <xsl:variable name="param_repository"> 256 <xsl:if test="$repository != ''"> 257 <xsl:value-of select="concat('&repository=',$repository)"></xsl:value-of> 258 </xsl:if> 259 </xsl:variable> 260 <xsl:variable name="param_startRecord"> 261 <xsl:if test="$startRecord != ''"> 262 <xsl:value-of select="concat('&startRecord=',$startRecord)"></xsl:value-of> 263 </xsl:if> 264 </xsl:variable> 265 <xsl:variable name="param_maximumRecords"> 266 <xsl:if test="$maximumRecords != ''"> 267 <xsl:value-of select="concat('&maximumRecords=',$maximumRecords)"></xsl:value-of> 268 </xsl:if> 269 </xsl:variable> 270 <xsl:value-of select="concat($url, '?', $param_query, $param_repository, $param_startRecord, $param_maximumRecords)" /> 271 </xsl:function> 272 273 236 274 <!-- previously known as comppath --> 237 275 <xsl:function name="my:context" > -
MDService2/branches/MDService_simple3/src/xsl/html_snippets.xsl
r1554 r1558 5 5 6 6 <!-- 7 <purpose>pieces of html wrapped in temp altes, to be reused by other stylesheets</purpose>7 <purpose>pieces of html wrapped in templates, to be reused by other stylesheets</purpose> 8 8 <history> 9 9 <change on="2011-09-01" type="created" by="vr">copied from cmd_commons.xsl</change> … … 17 17 <title><xsl:value-of select="$title"/></title> 18 18 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> 19 <link href="{$base_dir}/style/jquery/clarindotblue/jquery-ui-1.8.5.custom.css" type="text/css" rel="stylesheet" /> 20 <link href="{$base_dir}/style/cmds-ui.css" type="text/css" rel="stylesheet"></link> 21 22 <xsl:if test="$use_javascript='1'"> 23 <link href="{$base_dir}/style/jquery/jquery-treeview/jquery.treeview.css" rel="stylesheet" /> 24 <link href="{$base_dir}/style/jquery/treetable/jquery.treeTable.css" rel="stylesheet" ></link> 25 <!-- <link href="{$base_dir}/style/jquery/jquery-textboxlist/TextboxList.css" rel="stylesheet" type="text/css"></link> --> 26 <link href="{$base_dir}/style/jquery/jquery-autocomplete/jquery.autocomplete.css" rel="stylesheet" type="text/css"></link> 19 27 20 <link href="{$base_dir}/style/jquery/clarindotblue/jquery-ui-1.8.5.custom.css" type="text/css" rel="stylesheet" /> 21 <!-- <link href="{$base_dir}/style/jquery/jquery-treeview/jquery.treeview.css" rel="stylesheet" /> 22 <link href="{$base_dir}/style/jquery/treetable/jquery.treeTable.css" rel="stylesheet" ></link> 23 --> 24 <link href="{$base_dir}/style/cmds-ui.css" type="text/css" rel="stylesheet"></link> 25 <!-- 26 <link href="{$base_dir}style/jquery/jquery-textboxlist/TextboxList.css" rel="stylesheet" type="text/css"></link> 27 <link href="{$base_dir}style/jquery/jquery-autocomplete/jquery.autocomplete.css" rel="stylesheet" type="text/css"></link> 28 --> 29 <script src="{$base_dir}/scripts/jquery/js/jquery-1.4.2.js" type="text/javascript"></script> 30 <script src="{$base_dir}/scripts/jquery/js/jquery-ui-1.8.5.custom.min.js" type="text/javascript"></script> 31 <!-- <script src="{$base_dir}/scripts/jquery/jquery-treeview/jquery.treeview.js" type="text/javascript"></script> 32 <script src="{$base_dir}/scripts/jquery/jquery-treeTable/jquery.treeTable.js" type="text/javascript"></script> 33 <script src="{$base_dir}/scripts/mdservice_helpers.js" type="text/javascript"></script> 34 --> 35 <!-- <script src="scripts/jquery/jquery-autocomplete/jquery.autocomplete.js" type="text/javascript"></script> 28 <script src="{$base_dir}/scripts/jquery/js/jquery-1.4.2.js" type="text/javascript"></script> 29 <script src="{$base_dir}/scripts/jquery/js/jquery-ui-1.8.5.custom.min.js" type="text/javascript"></script> 36 30 37 <script src="scripts/mdservice_searchclause.js" type="text/javascript"></script> 38 <script src="scripts/mdservice_model.js" type="text/javascript"></script> 39 <script src="scripts/mdservice2_ui.js" type="text/javascript"></script> 40 --> 41 31 32 <script src="{$base_dir}/scripts/jquery/jquery-treeview/jquery.treeview.js" type="text/javascript"></script> 33 <script src="{$base_dir}/scripts/jquery/jquery-treeTable/jquery.treeTable.js" type="text/javascript"></script> 34 <script src="{$base_dir}/scripts/jquery/jsTree.v.1.0rc2/jquery.jstree.js" type="text/javascript"></script> 35 36 <script src="{$base_dir}/scripts/mdservice_helpers.js" type="text/javascript"></script> 37 <script src="{$base_dir}/scripts/jquery/jquery-autocomplete/jquery.autocomplete.js" type="text/javascript"></script> 38 <script src="{$base_dir}/scripts/jquery/jquery-layout/jquery.layout-1.3.0.rc29.12.js" type="text/javascript"></script> 39 40 <script src="{$base_dir}/scripts/mdservice_ui_settings.js" type="text/javascript"></script> 41 <script src="{$base_dir}/scripts/mdservice_helpers.js" type="text/javascript"></script> 42 <script src="{$base_dir}/scripts/mdservice_ui_helpers.js" type="text/javascript"></script> 43 <script src="{$base_dir}/scripts/mdservice_widgets.js" type="text/javascript"></script> 44 45 <script src="{$base_dir}/scripts/mdservice_searchclause.js" type="text/javascript"></script> 46 <script src="{$base_dir}/scripts/mdservice_model.js" type="text/javascript"></script> 47 <script src="{$base_dir}/scripts/mdservice_pz2.js" type="text/javascript"></script> 48 <script src="{$base_dir}/scripts/mdservice_ui_detail.js" type="text/javascript"></script> 49 <script src="{$base_dir}/scripts/mdservice_ui_load.js" type="text/javascript"></script> 50 51 <script src="{$base_dir}/scripts/mdservice_ui.js" type="text/javascript"></script> 52 53 </xsl:if> 54 42 55 </xsl:template> 43 56 … … 49 62 <div id="top-menu"> 50 63 <div id="user"> 64 <a href="{my:formURLparams($base_js_url, $q, $repository_name, $startRecord, $maximumRecords)}" > js </a> 51 65 <xsl:choose> 52 66 <xsl:when test="$user = ''" > … … 110 124 </xsl:template> 111 125 126 127 <xsl:template name="query-list" > 128 129 <!-- QUERYLIST BLOCK --> 130 <div id="querylistblock" class="cmds-ui-block"> 131 <div class="header ui-widget-header ui-state-default ui-corner-top" ><span>QUERYLIST</span></div> 132 <div class="content" id="querylist"> 133 </div> 134 </div> 135 </xsl:template> 136 137 <xsl:template name="detail-space" > 138 139 140 <div id="detailblock" class="cmds-ui-block"> 141 <div class="header ui-widget-header ui-state-default ui-corner-top" ><span>DETAIL</span></div> 142 <div class="content" id="details"></div> 143 </div> 144 </xsl:template> 145 146 <xsl:template name="public-space" > 147 148 <div id="public-space" class="cmds-ui-block"> 149 <div class="header"><span>Public Space</span></div> 150 151 <div id="serverqs" class="content" > 152 </div> 153 </div> 154 </xsl:template> 155 156 <xsl:template name="user-space" > 157 158 <div class="cmds-ui-block init-show" id="user-space"> 159 <div class="header" ><span>Personal Workspace</span></div> 160 <div id="userqs" class="content"> 161 <div id="userquerysets" > 162 <label>Querysets</label><select id="qts_select" ></select> 163 <!-- <button id="qts_add" class="cmd cmd_add" >Add</button> --> 164 <span id="qts_add" class="cmd cmd_add" ></span> 165 <span id="qts_delete" class="cmd cmd_del" ></span> 166 </div> 167 168 <label>name</label> 169 <input type="text" id="qts_input" ></input> 170 <span id="qts_save" class="cmd cmd_save" ></span> 171 <div id="userqueries" ></div> 172 </div> 173 <div id="userbs" class="content"> 174 <div id="bookmarksets" > 175 <label>Bookmarksets</label><select id="bts_select" ></select> 176 <span id="bts_add" class="cmd cmd_add" ></span> 177 <span id="bts_delete" class="cmd cmd_del" ></span> 178 <span id="bts_publish" class="cmd cmd_publish" ></span> 179 </div> 180 181 <label>name</label> 182 <input type="text" id="bts_input" ></input> 183 <span id="bts_save" class="cmd cmd_save" ></span> 184 <div id="bookmarks" ></div> 185 </div> 186 </div> 187 </xsl:template> 188 112 189 </xsl:stylesheet> -
MDService2/branches/MDService_simple3/src/xsl/params.xsl
r1555 r1558 11 11 <xsl:param name="base_dir" select="'/MDService2'" /> 12 12 <xsl:param name="base_url" select="'http://localhost:8080/MDService2/'" /> 13 <xsl:param name="base_js_url" select="'http://localhost:8080/MDService2/indexjs'" /> 13 14 14 15 <xsl:param name="docs_baseuri" select="concat($base_dir, '/docs/htmlpage/welcome')" /> -
MDService2/branches/MDService_simple3/src/xsl/static2view.xsl
r1522 r1558 32 32 <xsl:when test="@href='query-input'"> 33 33 <xsl:call-template name="query-input" /> 34 </xsl:when> 35 <xsl:when test="@href='query-list'"> 36 <xsl:call-template name="query-list" /> 37 </xsl:when> 38 <xsl:when test="@href='detail-space'"> 39 <xsl:call-template name="detail-space" /> 40 </xsl:when> 41 <xsl:when test="@href='public-space'"> 42 <xsl:call-template name="public-space" /> 43 </xsl:when> 44 <xsl:when test="@href='user-space'"> 45 <xsl:call-template name="user-space" /> 34 46 </xsl:when> 35 47 <xsl:otherwise>
Note: See TracChangeset
for help on using the changeset viewer.