Changeset 1574 for MDService2
- Timestamp:
- 10/04/11 10:40:18 (13 years ago)
- Location:
- MDService2/branches/MDService_simple3
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_model.js
r1569 r1574 900 900 // get.show(); 901 901 902 var result_header = $(this). children('.result-header');902 var result_header = $(this).find('.result-header'); 903 903 904 904 var q_header; … … 959 959 // get.show(); 960 960 961 var result_header = $(this). children('.result-header');961 var result_header = $(this).find('.result-header'); 962 962 963 963 var q_header; … … 1255 1255 q_header.find('.cmds .cmd_save').data('qid',query.listid); 1256 1256 q_header.find('.cmds .cmd_savenew').data('qid',query.listid); 1257 q_header.find('.cmd_reload').click(function() { 1258 /* 1259 var qid; 1260 if ($(this).parent().attr('class') == 'result-header'){ 1261 qid = $(this).closest('.query_wrapper').attr("id"); 1262 } else { 1263 var did = $(this).closest('.detail-wrapper').attr("id"); 1264 var slid = $(this).closest('.detail-wrapper').find('.selectionlist-widget').attr("id"); 1265 var detail = detailcaller.getdetail(did); 1266 qid = detail.temp_id; 1267 1268 var q = queryset.getQuery(qid); 1269 if (selectionlistset.getselectionlist(slid).autoSelected()){ 1270 q.columns = ""; 1271 } else 1272 { 1273 q.columns = selectionlistset.getselectionlist(slid).listwidget.getListText(); 1274 } 1275 } 1276 //queryset.resubmit(qid); 1277 */ 1278 // update columns if reloaded from detail pane 1279 /* 1280 if ($(this).parent().attr('class') != 'result-header'){ 1281 var slid = $(this).closest('.detail-wrapper').find('.selectionlist-widget').attr("id"); 1282 if (selectionlistset.getselectionlist(slid).autoSelected()){ 1283 $(this).data('query').columns = ""; 1284 } else 1285 { 1286 $(this).data('query').columns = selectionlistset.getselectionlist(slid).listwidget.getListText(); 1287 } 1288 } 1289 */ 1290 /* 1291 var slid = $(this).closest('.detail-wrapper').find('.selectionlist-widget').attr("id"); 1292 if (slid != undefined){ 1293 $(this).data('query').updateColumns($(this).data('detail')); 1294 } 1295 */ 1257 q_header.find('.cmd_reload').click(function(event) { 1258 event.preventDefault(); 1296 1259 $(this).data('query').updateColumns($(this).data('selectionlist')); 1297 1260 $(this).data('query').resubmit(); 1298 1261 }); 1299 q_header.find('.cmd_prev').click(function() { 1300 /* 1301 var qid = $(this).closest('.query_wrapper').attr("id"); 1302 queryset.next(qid,-1); 1303 */ 1304 $(this).closest('.query_header').data('query').next(-1); 1305 }); 1306 q_header.find('.cmd_next').click(function() { 1307 /* 1308 var qid = $(this).closest('.query_wrapper').attr("id"); 1309 queryset.next(qid,1); 1310 */ 1311 $(this).closest('.query_header').data('query').next(1); 1262 q_header.find('a.internal').click(function(event) { 1263 event.preventDefault(); 1264 if ($(this).hasClass('prev')){ 1265 $(this).closest('.query_header').data('query').next(-1); 1266 } 1267 if ($(this).hasClass('next')){ 1268 $(this).closest('.query_header').data('query').next(1); 1269 } 1270 1312 1271 }); 1313 1272 1314 1273 q_header.find('.value-format').data('query',query); 1315 1274 q_header.find('.value-format').change(function(){ 1316 /*1317 var did = $(this).closest('.detail-wrapper').attr("id");1318 var qid = detailcaller.getdetail(did).temp_id;1319 var q = queryset.getQuery(qid);1320 queryset.resubmit(qid);1321 */1322 1275 $(this).data('query').format = $(this).find('option:selected').val(); 1323 1276 $(this).data('query').resubmit(); … … 1332 1285 q_header.find('.terms-tree').treeTable({initialState:"collapsed"}); 1333 1286 1334 1335 }; 1287 }; -
MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_ui.js
r1569 r1574 142 142 143 143 // DETAIL-CALLER 144 /*145 $('.detail-caller, .cmd_detail').live('click', function(event) {146 $(this).parent().children('.detail').toggle();147 $(this).children('.cmd_down, .cmd_up').toggleClass('cmd_down cmd_up');148 });149 */150 144 $('.detail-caller a').live('click', function(event) { 151 145 event.preventDefault(); … … 155 149 event.preventDefault(); 156 150 157 var uri = $(this).attr('href'); // + " body"; 158 //notifyUser('internal-link: ' + uri,'debug' ); 159 //$.get(uri, showDetail,'html'); 151 var uri = $(this).attr('href'); 160 152 detailcaller.calldetail(undefined, "record", uri); 161 153 }); … … 211 203 212 204 }); 205 206 213 207 214 208 // cmd_up cmd_down -
MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_ui_detail.js
r1558 r1574 124 124 //enrich with selectionlist 125 125 var selectionlist = new SelectionList($(this.content).find('.columns-selected')); 126 //selectionlist.slid = "sl_" + query.listid; 127 //selectionlist.render(); 126 128 selectionlistset.add(selectionlist); 127 129 //selectionlist.listwidget.query = query; -
MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_widgets.js
r1252 r1574 194 194 //var q; 195 195 if (lvid.beginsWith("sl")){ 196 sl = selectionlistset.getselectionlist($(this).closest('.selectionlist-widget').attr("id"));196 sl = $(this).closest('.selectionlist-widget').data('selectionlist');//selectionlistset.getselectionlist($(this).closest('.selectionlist-widget').attr("id")); 197 197 if (sl.autoSelected()){ 198 198 sl.select(0); … … 630 630 631 631 //$(this.parent_div).find 632 $(this.parent_div).find('.selectionlist-widget').data('selectionlist',this); 632 633 }; 633 634 … … 641 642 }; 642 643 */ 643 644 /** 645 * FIXME: What is this for? 646 * @constructor 647 */ 644 645 //TODO what is this for? 648 646 var selectionlistset = { selectionlists: [], 649 647 -
MDService2/branches/MDService_simple3/src/xsl/cmd_commons.xsl
r1559 r1574 212 212 213 213 <xsl:template match="IsPartOf" > 214 <a class="internal" href="{concat($default_prefix, my:encodePID(.))}"><xsl:value-of select="." /></a> > 214 <!-- <a class="internal" href="{concat($default_prefix, my:encodePID(.))}"><xsl:value-of select="." /></a> > --> 215 <a class="internal" href="{my:formURL('record','htmldetail', my:encodePID(.))}"><xsl:value-of select="." /></a> > 215 216 </xsl:template> 216 217 -
MDService2/branches/MDService_simple3/src/xsl/cmd_functions.xsl
r1559 r1574 183 183 <xsl:param name="q" /> 184 184 185 <xsl:variable name="param_q"> 186 <xsl:if test="$q != ''"> 187 <xsl:value-of select="concat('&query=',$q)"></xsl:value-of> 188 </xsl:if> 189 </xsl:variable> 190 <xsl:variable name="param_repository"> 191 <xsl:if test="$repository_name != ''"> 192 <xsl:value-of select="concat('&repository=',$repository_name)"></xsl:value-of> 193 </xsl:if> 194 </xsl:variable> 195 <xsl:variable name="param_startRecord"> 196 <xsl:if test="$startRecord != ''"> 197 <xsl:value-of select="concat('&startRecord=',$startRecord)"></xsl:value-of> 198 </xsl:if> 199 </xsl:variable> 200 <xsl:variable name="param_maximumRecords"> 201 <xsl:if test="$maximumRecords != ''"> 202 <xsl:value-of select="concat('&maximumRecords=',$maximumRecords)"></xsl:value-of> 203 </xsl:if> 204 </xsl:variable> 205 206 185 207 <xsl:choose> 186 208 <xsl:when test="$action=''"> … … 188 210 </xsl:when> 189 211 <xsl:when test="$q=''"> 190 <!-- <xsl:value-of select="concat($base_dir, '/',$action, '/?format=', $format)" />-->191 212 <xsl:value-of select="concat($base_dir, '/',$action, '/', $format)" /> 192 213 </xsl:when> 193 <xsl:otherwise> 214 <xsl:otherwise> 194 215 <xsl:choose> 195 <xsl:when test="$repository_name=''"> 196 <xsl:value-of select="concat($base_dir, '/',$action, '/', $format, '?query=', $q)" /> 197 </xsl:when> 198 <xsl:when test="$startRecord=''"> 199 <xsl:value-of select="concat($base_dir, '/',$action, '/', $format, '?query=', $q, '&repository=', $repository_name)" /> 200 </xsl:when> 216 <xsl:when test="$action='record'"> 217 <xsl:value-of select="concat($base_dir, '/',$action, '/', $format, '?query=', $q, $param_repository)" /> 218 </xsl:when> 201 219 <xsl:otherwise> 202 <xsl:value-of select="concat($base_dir, '/',$action, '/', $format, '?query=', $q, '&repository=', $repository_name, '&startRecord=', $startRecord, '&maximumRecords=', $maximumRecords)" />220 <xsl:value-of select="concat($base_dir, '/',$action, '/', $format, '?query=', $q, $param_repository, $param_startRecord, $param_maximumRecords)" /> 203 221 </xsl:otherwise> 204 </xsl:choose>222 </xsl:choose> 205 223 </xsl:otherwise> 206 224 </xsl:choose> … … 208 226 </xsl:function> 209 227 228 <!-- TODO may be - possible done using my:formURL --> 210 229 <xsl:function name="my:formsearchURL" > 211 <xsl:param name="lquery" />212 230 <xsl:param name="startRecord" /> 213 231 <xsl:param name="maximumRecords" /> 214 <xsl:param name="repository" /> 215 216 <xsl:variable name="searchurl" select="my:formURL('search','htmlpage',$lquery)" /> 232 233 <xsl:variable name="searchurl" select="my:formURL('search','htmlpage','')" /> 217 234 <xsl:variable name="param_repository"> 218 <xsl:if test="$repository != ''"> 219 <xsl:value-of select="concat('&repository=',$repository)"></xsl:value-of> 235 <xsl:if test="$repository_name != ''"> 236 <xsl:value-of select="concat('&repository=',$repository_name)"></xsl:value-of> 237 </xsl:if> 238 </xsl:variable> 239 <xsl:variable name="param_query"> 240 <xsl:if test="$q != ''"> 241 <xsl:value-of select="concat('&query=',$q)"></xsl:value-of> 220 242 </xsl:if> 221 243 </xsl:variable> … … 230 252 </xsl:if> 231 253 </xsl:variable> 232 <xsl:value-of select="concat($searchurl, $param_ repository, $param_startRecord, $param_maximumRecords)" />254 <xsl:value-of select="concat($searchurl, $param_query, $param_repository, $param_startRecord, $param_maximumRecords)" /> 233 255 </xsl:function> 234 256 235 <xsl:function name="my:formURLparams" >236 <xsl:param name="url" />237 <xsl:param name="query" />238 <xsl:param name="repository" />239 <xsl:param name="startRecord" />240 <xsl:param name="maximumRecords" />241 242 <xsl:variable name="param_query">243 <xsl:if test="$query != ''">244 <xsl:value-of select="concat('query=',$query)"></xsl:value-of>245 </xsl:if>246 </xsl:variable>247 <xsl:variable name="param_repository">248 <xsl:if test="$repository != ''">249 <xsl:value-of select="concat('&repository=',$repository)"></xsl:value-of>250 </xsl:if>251 </xsl:variable>252 <xsl:variable name="param_startRecord">253 <xsl:if test="$startRecord != ''">254 <xsl:value-of select="concat('&startRecord=',$startRecord)"></xsl:value-of>255 </xsl:if>256 </xsl:variable>257 <xsl:variable name="param_maximumRecords">258 <xsl:if test="$maximumRecords != ''">259 <xsl:value-of select="concat('&maximumRecords=',$maximumRecords)"></xsl:value-of>260 </xsl:if>261 </xsl:variable>262 <xsl:value-of select="concat($url, '?', $param_query, $param_repository, $param_startRecord, $param_maximumRecords)" />263 </xsl:function>264 265 257 266 258 <!-- previously known as comppath --> -
MDService2/branches/MDService_simple3/src/xsl/html_snippets.xsl
r1561 r1574 64 64 <xsl:choose> 65 65 <xsl:when test="contains($format,'htmljspage')"> 66 <a href="{my:formURL params($base_url, $q, $repository_name, $startRecord, $maximumRecords)}" > none js </a>66 <a href="{my:formURL('search','htmlpage',$q)}" > none js </a> 67 67 </xsl:when> 68 68 <xsl:otherwise> 69 <a href="{my:formURL params($base_js_url, $q, $repository_name, $startRecord, $maximumRecords)}" > js </a>69 <a href="{my:formURL('search','htmljspage',$q)}" > js </a> 70 70 </xsl:otherwise> 71 71 </xsl:choose> -
MDService2/branches/MDService_simple3/src/xsl/mdset2view.xsl
r1561 r1574 12 12 <params> 13 13 <param name=""></param> 14 </params> 14 </params> 15 15 <history> 16 16 <change on="2010-03-26" type="created" by="vr">based on cmdi/scripts/cmdinst2view.xsl</change> … … 33 33 34 34 <!-- <xsl:param name="format" select="'table'" /> table|list|detail --> 35 <xsl:param name="col s" >Id,Title,Location35 <xsl:param name="columns" >Id,Title,Location 36 36 <!-- 37 37 <col label="id">Id</col> … … 52 52 </xsl:param> 53 53 54 <xsl:variable name="col umns" >55 <!-- <xsl:message>COLUMNS: <xsl:value-of select="$col s" /><xsl:value-of select="string-length($cols)" /></xsl:message> -->56 <xsl:variable name="colarray" select="tokenize($col s,',')"/>54 <xsl:variable name="cols" > 55 <!-- <xsl:message>COLUMNS: <xsl:value-of select="$columns" /><xsl:value-of select="string-length($columns)" /></xsl:message> --> 56 <xsl:variable name="colarray" select="tokenize($columns,',')"/> 57 57 <xsl:for-each select="$colarray" > 58 58 <col key="{.}" label="{replace(.,'^.*\.([^.]+)$','$1')}" xpath_osbolete="{replace(.,'\.','/')}" xpath="{my:index2xpath(.)}" /> … … 181 181 <input type="submit" value="" class="cmd cmd_reload"> 182 182 </input> 183 <!-- number($startRecord - $pageRecordCount)<a href="{my:formsearchURL($q,'1','20',$repository_name)}"><span class="cmd cmd_reload" /></a> -->184 183 <xsl:variable name="prev_startRecord"> 185 184 <xsl:choose> … … 194 193 </xsl:choose> 195 194 </xsl:variable> 196 <a href="{my:formsearchURL($q,$prev_startRecord,$maximumRecords,$repository_name)}">195 <a class="internal prev" href="{my:formsearchURL($prev_startRecord,$maximumRecords)}"> 197 196 <span> 198 197 <xsl:choose> … … 206 205 </span> 207 206 </a> 208 <a href="{my:formsearchURL($q,$next_startRecord,$maximumRecords,$repository_name)}">207 <a class="internal next" href="{my:formsearchURL($next_startRecord,$maximumRecords)}"> 209 208 <span class="cmd cmd_next"> 210 209 <xsl:choose> … … 218 217 </span> 219 218 </a> 220 <div> 221 <span class="label" >format:</span> 219 <span class="cmd cmd_detail" /> 220 221 <div class='ui-widget-content columns-wrapper'> 222 223 <span class="label" >format:</span> 222 224 <select class="value-format" name="format"> 223 225 … … 237 239 </option> 238 240 </select> 239 </div>240 </form>241 <span class="cmd cmd_detail" />242 <div class='ui-widget-content columns-wrapper'>243 241 <div class='cmds'><span class="cmd cmd_reload" /><span class="cmd cmd_save" /><span class="cmd cmd_savenew" /></div> 244 242 <div class='query-columns'> … … 247 245 </div> 248 246 </div> 249 247 </form> 250 248 </div> 251 249 … … 290 288 </div> 291 289 --> 292 290 293 291 <xsl:if test="extraResponseData/usedProfiles" > 294 292 <div class="used-profiles"> … … 302 300 </xsl:if> 303 301 </td></tr> 302 304 303 <xsl:variable name="resultSummary" > 305 304 <!-- wrap in <Terms> to make digestible for model2matrix --> … … 315 314 </Terms> 316 315 </xsl:variable> 317 <xsl:apply-templates select="$terms" mode="matrix" /> 316 317 <!-- <xsl:apply-templates select="$terms" mode="matrix" />--> 318 318 </xsl:variable> 319 319 <!-- <xsl:message><xsl:value-of select="$resultSummary/*/name()" /> </xsl:message>--> … … 323 323 <span class="label">structure summary of shown result</span> 324 324 <!-- calling template in terms2view.xsl --> 325 <!-- <xsl:apply-templates select="$resultSummary" mode="terms-tree" />--> 325 326 <!-- <xsl:apply-templates select="$resultSummary" mode="terms-tree" />--> 327 326 328 </div> 327 329 </td></tr> … … 333 335 <table class="show"> 334 336 <thead><tr><th>pos</th> 335 <xsl:for-each select="$col umns/*">337 <xsl:for-each select="$cols/*"> 336 338 <th title="{@key}" ><xsl:value-of select="@label"/></th> 337 339 </xsl:for-each> … … 363 365 <xsl:variable name="curr_record" select="." /> 364 366 <xsl:variable name="fields" > 365 <xsl:for-each select="$col umns/*">367 <xsl:for-each select="$cols/*"> 366 368 <!-- <td ><xsl:value-of select="$curr_cmd//*[name()=current()]" /></td> --> 367 369 <!-- <xsl:message><xsl:copy-of select="."></xsl:copy-of> </xsl:message> --> … … 388 390 <xsl:variable name="curr_record" select="." /> 389 391 <xsl:variable name="cmd_sel_fields" > 390 <xsl:for-each select="$col umns/*">392 <xsl:for-each select="$cols/*"> 391 393 <xsl:variable name="curr_col_xpath" select="@xpath" /> 392 394 <xsl:for-each select="$curr_record"> … … 425 427 </xsl:when> 426 428 <xsl:otherwise> 427 <a class="internal" href="{ concat('record/htmldetail/', my:encodePID(.//MdSelfLink), '?repository=', $repository_name)}" >429 <a class="internal" href="{my:formURL('record', 'htmldetail', my:encodePID(.//MdSelfLink))}" > 428 430 <xsl:value-of select="$absolute_position" /> 429 431 </a> 430 432 </xsl:otherwise> 431 433 </xsl:choose> 432 <span class="cmd cmd_detail" ></span> 434 <a class="internal" href="{my:formURL('record', 'htmldetail', my:encodePID(.//MdSelfLink))}"><span class="cmd cmd_detail" ></span></a> 435 433 436 <span class="cmd cmd_save" ></span> 434 437 </xsl:when> … … 436 439 </xsl:choose> 437 440 </td> 438 <td colspan="{count($col umns/*)}" >441 <td colspan="{count($cols/*)}" > 439 442 <xsl:call-template name="getContext" /> 440 443 <div class="title" ><xsl:call-template name="getName" /></div> … … 456 459 <table class="show"> 457 460 <thead><tr><th>pos</th> 458 <xsl:for-each select="$col umns/*">461 <xsl:for-each select="$cols/*"> 459 462 <th title="{@key}" ><xsl:value-of select="@label"/></th> 460 463 </xsl:for-each> -
MDService2/branches/MDService_simple3/src/xsl/terms2view.xsl
r1236 r1574 236 236 </xsl:choose> 237 237 </xsl:variable> 238 239 238 240 <td class="treecol" ><span class="cmd cmd_query" ></span><span class="cmd cmd_columns" ></span> 239 241 <span class="column-elem"><xsl:copy-of select="$path_anchored" /></span><span class="cmd cmd_info" ></span> … … 252 254 </td> 253 255 254 <td class="number"> 255 <xsl:if test="not(Term)"><a class="value-caller" href="{my:formURL('values', 'htmllist', concat(@path,'&sort=size'))}" ><xsl:value-of select="format-number(@count_distinct_text,'#.##0','european')" /></a></xsl:if> 256 <td class="number"> 257 <xsl:if test="not(Term)"><a class="value-caller" href="{my:formURL('values', 'htmllist', concat(@path,'&sort=size'))}" ><xsl:value-of select="format-number(@count_distinct_text,'#.##0','european')" /></a> 258 <xsl:message><xsl:value-of select="concat('formURL: ',my:formURL('values', 'htmllist', concat(@path,'&sort=size')))"></xsl:value-of></xsl:message> 259 </xsl:if> 256 260 <xsl:if test="Term"><xsl:value-of select="format-number(sum(descendant::Term/@count_distinct_text),'#.##0','european')" /></xsl:if> 257 261 </td>
Note: See TracChangeset
for help on using the changeset viewer.