Project

General

Profile

« Previous | Next » 

Revision 4976

Added by daigle over 15 years ago

Beef up search. Change pdf report element name.

View differences:

lib/style/common/searchWorkflowRunSection.jsp
49 49 
<%
50 50 
					if (request.getParameter("workflowid") != null) {
51 51 
%>          			<input name="workflow-lsid" id="sf-workflow-id1000" value="<%= request.getParameter("workflowid") %>" type="hidden">
52 
           				<input name="metadata-type-searchmode" id="sm-workflow-id1000" value="equals" type="hidden">
52 
           				<input name="metadata-type-searchmode" id="sm-workflow-id1000" value="starts-with" type="hidden">
53 53 
<%
54 54 
					}
55 55 
%>
lib/style/common/searchWorkflow.js
38 38 
	queryString += "<returndoctype>entity</returndoctype>";
39 39 
	queryString += "<returndoctype>-//UC Berkeley//DTD MoML 1//EN</returndoctype>";
40 40 
	queryString += "<returnfield>/entity/@name</returnfield>";
41 
	queryString += "<returnfield>property[@name=\'KeplerDocumentation\']/property[@name=\'author\']/configure</returnfield>";
42 
	queryString += "<returnfield>property[@name=\'KeplerDocumentation\']/property[@name=\'description\']/configure</returnfield>";
43 
	queryString += "<returnfield>property[@name=\'KeplerDocumentation\']/property[@name=\'createDate\']/configure</returnfield>";
44 
	queryString += "<returnfield>property[@name=\'KeplerDocumentation\']/property[@name=\'workflowId\']/configure</returnfield>";
45 
	queryString += "<returnfield>property[@name=\'KeplerDocumentation\']/property[@name=\'status\']/configure</returnfield>";
46 
	queryString += "<returnfield>property[@name=\'KeplerDocumentation\']/property[@name=\'runDate\']/configure</returnfield>";
47 
	queryString += "<returnfield>property[@name=\'KeplerDocumentation\']/property[@name=\'pdfReport\']/configure</returnfield>";
48 
	queryString += "<returnfield>property[@name=\'KeplerDocumentation\']/property[@name=\'htmlReport\']/configure</returnfield>";
41 
	queryString += "<returnfield>/entity/property[@name=\'KeplerDocumentation\']/property[@name=\'author\']/configure</returnfield>";
42 
	queryString += "<returnfield>/entity/property[@name=\'KeplerDocumentation\']/property[@name=\'description\']/configure</returnfield>";
43 
	queryString += "<returnfield>/entity/property[@name=\'KeplerDocumentation\']/property[@name=\'createDate\']/configure</returnfield>";
44 
	queryString += "<returnfield>/entity/property[@name=\'KeplerDocumentation\']/property[@name=\'workflowId\']/configure</returnfield>";
49 45 
	queryString += "<returnfield>/entity/property[@name=\'karLSID\']/@value</returnfield>";
50 46 
	queryString += "<returnfield>/entity/property[@name=\'entityId\']/@value</returnfield>";
51 47
lib/style/common/searchWorkflowRun.js
23 23 
	queryString += "<returnfield>/property[@name=\'WorkflowRun\']/property[@name=\'pdfReport\']/@value</returnfield>";
24 24 
	queryString += "<returnfield>/property[@name=\'WorkflowRun\']/property[@name=\'htmlReport\']/@value</returnfield>";
25 25 
	queryString += "<returnfield>/property[@name=\'WorkflowRun\']/property[@name=\'karLSID\']/@value</returnfield>";
26 
	queryString += "<returnfield>/property[@name=\'WorkflowRun\']/property[@name=\'ReportInstance0\']/@value</returnfield>";
26 
	queryString += "<returnfield>/property[@name=\'WorkflowRun\']/property[@name=\'ReportInstance_pdf\']/@value</returnfield>";
27 27
28 28 
	queryString += "<querygroup operator='INTERSECT'>";
29 29
......
103 103 
		pathExpr += "<value>workflowLSID</value>";
104 104 
		pathExpr += "<pathexpr>property/property/@name</pathexpr>";
105 105 
		pathExpr += "</queryterm>";
106 
//		pathExpr += "<queryterm casesensitive='false' searchmode='" + searchMode + "'>";
107 
//		pathExpr += "<value>" + sfElement.value + "</value>";
108 
//		pathExpr += "<pathexpr>property/property/@value</pathexpr>";
109 
//		pathExpr += "</queryterm>";
106 
		pathExpr += "<queryterm casesensitive='false' searchmode='starts-with'>";
107 
		var workflowId = sfElement.value;
108 
		var lastColonPos = workflowId.lastIndexOf(':');
109 
		var truncWorkflowId = workflowId.substring(0, lastColonPos);
110 
		pathExpr += "<value>" + truncWorkflowId + "</value>";
111 
		pathExpr += "<pathexpr>property/property/@value</pathexpr>";
112 
		pathExpr += "</queryterm>";
110 113 
	} else if (sfElement.name == 'workflow-run-id') {
111 114 
		pathExpr += "<queryterm casesensitive='false' searchmode='" + searchMode + "'>";
112 115 
		pathExpr += "<value>" + sfElement.value + "</value>";
lib/style/common/searchWorkflowRunResultset.xsl
78 78 
						<a>
79 79 
							<xsl:attribute name="class">underlined</xsl:attribute>
80 80 
							<xsl:attribute name="href">
81 
								<xsl:value-of select='$contextURL' />/metacat?action=read&amp;docid=<xsl:value-of select='./param[@name="/property[@name=&apos;WorkflowRun&apos;]/property[@name=&apos;karLSID&apos;]/@value"]' />&amp;archiveEntryName=<xsl:value-of select='./param[@name="/property[@name=&apos;WorkflowRun&apos;]/property[@name=&apos;ReportInstance0&apos;]/@value"]' />
81 
								<xsl:value-of select='$contextURL' />/metacat?action=read&amp;docid=<xsl:value-of select='./param[@name="/property[@name=&apos;WorkflowRun&apos;]/property[@name=&apos;karLSID&apos;]/@value"]' />&amp;archiveEntryName=<xsl:value-of select='./param[@name="/property[@name=&apos;WorkflowRun&apos;]/property[@name=&apos;ReportInstance_pdf&apos;]/@value"]' />
82 82 
							</xsl:attribute>
83 83 
							PDF
84 84 
						</a>

Also available in: Unified diff