Project

General

Profile

« Previous | Next » 

Revision 2807

Added by sgarg almost 19 years ago

Modified the search queries so that moderator doesnt see the documents for which revision is requested

View differences:

lib/style/skins/esa/esa-login.xsl
57 57
		var queryInput = document.createElement("input");
58 58
        	queryInput.setAttribute("type", "hidden");
59 59
        	queryInput.setAttribute("name", "query");
60
        	queryInput.setAttribute("value", "<pathquery version=\"1.2\"><querytitle>Moderator-Search</querytitle><returndoctype>eml://ecoinformatics.org/eml-2.0.1</returndoctype><returndoctype>eml://ecoinformatics.org/eml-2.0.0</returndoctype><returndoctype>-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN</returndoctype><returndoctype>-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN</returndoctype><returndoctype>-//NCEAS//resource//EN</returndoctype><returndoctype>-//NCEAS//eml-dataset//EN</returndoctype><returnfield>originator/individualName/surName</returnfield><returnfield>originator/individualName/givenName</returnfield><returnfield>creator/individualName/surName</returnfield><returnfield>creator/individualName/givenName</returnfield><returnfield>originator/organizationName</returnfield><returnfield>creator/organizationName</returnfield><returnfield>dataset/title</returnfield><returnfield>keyword</returnfield><querygroup operator=\"INTERSECT\"><queryterm searchmode=\"not-contains\" casesensitive=\"false\"><value>public</value><pathexpr>dataset/access/allow/principal</pathexpr></queryterm></querygroup></pathquery>");
60
        	queryInput.setAttribute("value", "<pathquery version=\"1.2\"><querytitle>Moderator-Search</querytitle><returndoctype>eml://ecoinformatics.org/eml-2.0.1</returndoctype><returndoctype>eml://ecoinformatics.org/eml-2.0.0</returndoctype><returndoctype>-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN</returndoctype><returndoctype>-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN</returndoctype><returndoctype>-//NCEAS//resource//EN</returndoctype><returndoctype>-//NCEAS//eml-dataset//EN</returndoctype><returnfield>originator/individualName/surName</returnfield><returnfield>originator/individualName/givenName</returnfield><returnfield>creator/individualName/surName</returnfield><returnfield>creator/individualName/givenName</returnfield><returnfield>originator/organizationName</returnfield><returnfield>creator/organizationName</returnfield><returnfield>dataset/title</returnfield><returnfield>keyword</returnfield><querygroup operator=\"INTERSECT\"><queryterm searchmode=\"not-contains\" casesensitive=\"false\"><value>public</value><pathexpr>dataset/access/allow/principal</pathexpr></queryterm><queryterm searchmode=\"not-contains\" casesensitive=\"false\"><value>Revision Requested</value><pathexpr>additionalMetadata/moderatorComment</pathexpr></queryterm></querygroup></pathquery>");
61 61
		searchForm.appendChild(queryInput);	
62 62
		searchForm.submit();
63 63
	}]]>
lib/style/skins/esa/header.html
84 84
					login_block.innerHTML = "<a href='@cgi-prefix@/register-dataset.cgi?cfg=esa&stage=loginform' target='_top' onMouseOut='MM_swapImgRestore();' onMouseOver='MM_swapImage(\"ESALogin\",\"\",\"ESAHeaderSlices/RollOvers/ESALoginR.gif\",1);'><img name='ESALogin' src='ESAHeaderSlices/ESALogin.gif' width='57' height='17' border='0' alt='Login'></a>";
85 85
                        	} else {
86 86
					login_block.innerHTML = "<a href='@cgi-prefix@/register-dataset.cgi?cfg=esa&stage=logout' target='_top' onMouseOut='MM_swapImgRestore();' onMouseOver='MM_swapImage(\"ESALogout\",\"\",\"ESAHeaderSlices/RollOvers/ESALogoutR.gif\",1);'><img name='ESALogout' src='ESAHeaderSlices/ESALogout.gif' width='57' height='17' border='0' alt='Login'></a>";
87

  
88
					//if(response.indexOf("isModerator") > 0){
89
						document.getElementById("modLink").className="showLink";
90
					//}
87
					
88
					if(response.indexOf("isModerator") > 0){
89
                                                document.getElementById("modLink").className="showLink";
90
                                        } else {
91
                                                document.getElementById("userLink").className="showLink";
92
                                        }
91 93
	                	}
92 94
                	}
93 95
		}
......
146 148
       <input type="hidden" name="action" value="squery"/>
147 149
       <input type="hidden" name="qformat" value="esa"/>
148 150
       <input type="hidden" name="enableediting" value="true"/>
149
       <input type="hidden" name="query" value="<pathquery><querytitle>Moderator-Search</querytitle><returndoctype>eml://ecoinformatics.org/eml-2.0.1</returndoctype><returndoctype>eml://ecoinformatics.org/eml-2.0.0</returndoctype><returndoctype>-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN</returndoctype><returndoctype>-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN</returndoctype><returndoctype>-//NCEAS//resource//EN</returndoctype><returndoctype>-//NCEAS//eml-dataset//EN</returndoctype><returnfield>originator/individualName/surName</returnfield><returnfield>originator/individualName/givenName</returnfield><returnfield>creator/individualName/surName</returnfield><returnfield>creator/individualName/givenName</returnfield><returnfield>originator/organizationName</returnfield><returnfield>creator/organizationName</returnfield><returnfield>dataset/title</returnfield><returnfield>keyword</returnfield><querygroup operator='INTERSECT'><queryterm searchmode='not-contains' casesensitive='false'><value>public</value><pathexpr>dataset/access/allow/principal</pathexpr></queryterm></querygroup></pathquery>"/>
151
       <input type="hidden" name="query" value="<pathquery><querytitle>Moderator-Search</querytitle><returndoctype>eml://ecoinformatics.org/eml-2.0.1</returndoctype><returndoctype>eml://ecoinformatics.org/eml-2.0.0</returndoctype><returndoctype>-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN</returndoctype><returndoctype>-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN</returndoctype><returndoctype>-//NCEAS//resource//EN</returndoctype><returndoctype>-//NCEAS//eml-dataset//EN</returndoctype><returnfield>originator/individualName/surName</returnfield><returnfield>originator/individualName/givenName</returnfield><returnfield>creator/individualName/surName</returnfield><returnfield>creator/individualName/givenName</returnfield><returnfield>originator/organizationName</returnfield><returnfield>creator/organizationName</returnfield><returnfield>dataset/title</returnfield><returnfield>keyword</returnfield><querygroup operator='INTERSECT'><queryterm searchmode='not-contains' casesensitive='false'><value>public</value><pathexpr>dataset/access/allow/principal</pathexpr></queryterm><queryterm searchmode='not-contains' casesensitive='false'><value>Revision Requested</value><pathexpr>additionalMetadata/moderatorComment</pathexpr></queryterm></querygroup></pathquery>"/>
150 152
<p><a id="modLink" class="hide" onClick="this.parentNode.parentNode.submit();">View documents pending moderation</a></p>
151 153
</form>
154
<form id="userSearch" name="userSearch" action="@servlet-path@" method="post" target="_top">
155
       <input type="hidden" name="action" value="squery"/>
156
       <input type="hidden" name="qformat" value="esa"/>
157
       <input type="hidden" name="enableediting" value="true"/>
158
       <input type="hidden" name="query" value="<pathquery><querytitle>Moderator-Search</querytitle><returndoctype>eml://ecoinformatics.org/eml-2.0.1</returndoctype><returndoctype>eml://ecoinformatics.org/eml-2.0.0</returndoctype><returndoctype>-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN</returndoctype><returndoctype>-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN</returndoctype><returndoctype>-//NCEAS//resource//EN</returndoctype><returndoctype>-//NCEAS//eml-dataset//EN</returndoctype><returnfield>originator/individualName/surName</returnfield><returnfield>originator/individualName/givenName</returnfield><returnfield>creator/individualName/surName</returnfield><returnfield>creator/individualName/givenName</returnfield><returnfield>originator/organizationName</returnfield><returnfield>creator/organizationName</returnfield><returnfield>dataset/title</returnfield><returnfield>keyword</returnfield><querygroup operator='INTERSECT'><queryterm searchmode='not-contains' casesensitive='false'><value>public</value><pathexpr>dataset/access/allow/principal</pathexpr></queryterm></querygroup></pathquery>"/>
159
<p><a id="userLink" class="hide" onClick="this.parentNode.parentNode.submit();">View documents pending approval</a></p>
160
</form>
152 161
<script>
153 162
MM_preloadImages('ESAHeaderSlices/ESAHome2_f2.gif','ESAHeaderSlices/RollOvers/ESAHomeR.gif','ESAHeaderSlices/RollOvers/ESARegistryR.gif','ESAHeaderSlices/RollOvers/ESANewDataSetR.gif','ESAHeaderSlices/RollOvers/ESASearchR.gif','ESAHeaderSlices/RollOvers/ESALoginR.gif');
154 163
loginStatus();
155 164
</script>
156
</body>
165
</body>

Also available in: Unified diff