Changeset 728
- Timestamp:
- 09/28/10 19:50:08 (14 years ago)
- Location:
- MDService2/trunk/MDService2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/WebContent/index.jsp
r715 r728 42 42 <div id="header" > 43 43 <h1>MDService2</h1> 44 <div id="top-menu"><a href="static/profiles_stats.html" >Info from CompReg and DCR about Elements vs. DatCats</a> </div> 44 <div id="top-menu"> 45 User: <b><%= request.getRemoteUser() %></b><a href="workspace.jsp" > login</a><br> 46 <a href="static/profiles_stats.html" >Info from CompReg and DCR about Elements vs. DatCats</a> 47 </div> 45 48 </div> 46 49 -
MDService2/trunk/MDService2/WebContent/workspace.jsp
r715 r728 3 3 <%@ taglib prefix="s" uri="/struts-tags" %> 4 4 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> 5 6 7 5 8 <html> 6 9 <head> 7 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> 8 <title>MDService2</title> 9 <link rel="stylesheet" href="style/jquery/smoothness/jquery-ui-1.8.1.custom.css" type="text/css"> 10 <link href="style/jquery/jquery-treeview/jquery.treeview.css" rel="stylesheet"> 11 <link href="style/metares.css" type="text/css" rel="stylesheet"> 12 <link href="style/cmdi.css" type="text/css" rel="stylesheet"> 13 <link href="style/query.css" type="text/css" rel="stylesheet"> 14 <link href="style/jquery/jquery-textboxlist/TextboxList.css" rel="stylesheet" type="text/css"> 15 <link href="style/jquery/jquery-autocomplete/jquery.autocomplete.css" rel="stylesheet" type="text/css"> 16 17 18 <script src="scripts/jquery/js/jquery-1.3.2.min.js" type="text/javascript"></script> 19 <script src="scripts/jquery/js/jquery-1.4.2.js" type="text/javascript"></script> 20 <script src="scripts/jquery/js/jquery-ui-1.8.1.custom.min.js" type="text/javascript"></script> 21 22 23 <script src="scripts/jquery/jquery-textboxlist/GrowingInput.js" type="text/javascript"></script> 24 <!-- 25 <script src="scripts/jquery/jquery-textboxlist/TextboxList.js" type="text/javascript"></script> 26 27 --> 28 29 <script src="scripts/jquery/jquery-treeview/jquery.treeview.js" type="text/javascript"></script> 30 <script src="scripts/jquery/jquery-autocomplete/jquery.autocomplete.js" type="text/javascript"></script> 31 32 <script src="scripts/mdservice_searchclause.js" type="text/javascript"></script> 33 <script src="scripts/mdservice_model.js" type="text/javascript"></script> 34 <script src="scripts/mdservice2_ui.js" type="text/javascript"></script> 35 36 10 <meta HTTP-EQUIV="REFRESH" content="0; url=http://localhost:8080/MDService2/"></head> 37 11 </head> 38 12 <body> 39 <div id="header" >40 <h1>MDService2-Workspace</h1>41 <div id="top-menu"><a href="static/profiles_stats.html" >Info from CompReg and DCR about Elements vs. DatCats</a> </div>42 43 You are logged in as remote user44 <b><%= request.getRemoteUser() %></b>45 in session <b><%= session.getId() %></b><br><br>46 </div>47 48 <div id="left-menu" >49 <div>50 <h2>Sample Queries</h2>51 <div id="serverqs" class="block" data="">52 <div id="serverquerysets" >53 <select id="serverqts_select" width="130" style="width: 130px"></select>54 </div>55 <div id="serverqueries" ></div>56 </div>57 </div>58 59 <div>60 <h2>Querysets/Queries</h2>61 <div id="userqs" class="block">62 <div id="userquerysets" >63 <select id="qts_select" width="130" style="width: 130px"></select>64 <button id="qts_add" style="font-size:8px; width: 35px;">Add</button>65 <button id="qts_delete" style="font-size:8px; width: 35px;">Delete</button>66 <label style="font-size:8px;">Name:</label>67 <input id="qts_input" width="100" style="width: 100px"></input>68 <button id="qts_save" style="font-size:8px;">Save</button>69 70 </div>71 <div id="userqueries" ></div>72 </div>73 74 </div>75 76 <div>77 <h2>Collections</h2>78 <div id="collections" class="block">79 </div>80 </div>81 <div>82 <h2>Terms</h2>83 <div id="terms" class="block">84 <div id="model_profiles">85 </div>86 <div id="model_terms">87 </div>88 </div>89 </div>90 <!--91 <div>92 <h2>TermsOld</h2>93 <div id="termsOld" class="block">94 95 </div>96 </div>97 -->98 99 <div>100 <h2>Profiles/Components</h2>101 <div id="compreg" class="block">102 <div id="profiles" >103 </div>104 <div id="components" >105 </div>106 </div>107 108 </div>109 <div>110 <h2>isocatDCR</h2>111 <div id="dcr" class="block">112 <p>isocatDCR</p>113 </div>114 </div>115 </div>116 117 <div id="main" class="block">118 <div id="notify" class="block note">119 </div>120 <div id="search" class="block">121 122 <s:form action="searchretrieve">123 <!-- <label id="toggle_inputmode_cmd" value="TEXT" />-->124 <label>query</label>125 <s:textfield id="query_list" name="_query" />126 <s:textarea id="query_area" name="_query" cols="60" rows="3" />127 128 <table>129 <td><label>collections</label><br/>130 <textarea id="collection_list" cols="40" rows="1" ></textarea>131 </td>132 <td><label>columns</label><br/>133 <textarea id="columns_list" cols="40" rows="1" ></textarea>134 </td></tr>135 </table>136 137 138 139 <s:submit value="Submit" />140 </s:form>141 142 143 </div>144 145 <div id="querylist" class="block">146 </div>147 148 <div id="detail-float">149 <!--150 <ul>151 <li><a href="#tabs-1">Tab 1</a></li>152 </ul>153 <div id="tabs-1">154 <p>New tab</p>155 </div>156 -->157 </div>158 159 <div id="detail">160 <!-- <ul>161 <li><a href="#tabs-1">Tab 1</a></li>162 </ul>163 <div id="tabs-1">164 <p>New tab</p>165 </div>166 -->167 </div>168 169 170 </div>171 172 <div id="bubble">173 </div>174 175 <div id="bubble1" >176 <input type="text" id="q1" />177 </div>178 <div id="bubble2" >179 <input type="text" id="q2" />180 </div>181 182 183 13 </body> 184 14 </html> -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java
r715 r728 166 166 String profilename = null; 167 167 168 Admin.notifyUser("QQQremoteUSER:" + type.toLowerCase()); 169 Admin.notifyUser("QQQremoteUSER:" + USER); 170 Admin.notifyUser("QQQremoteUSER:" + getServletRequest().getRemoteUser()); 168 //Admin.notifyUser("QQQremoteUSER:" + USER); 169 //Admin.notifyUser("QQQremoteUSER:" + getServletRequest().getRemoteUser()); 171 170 if (type.toLowerCase().equals(USER)) { 172 Admin.notifyUser("WWWaaaremoteUSER:" + getServletRequest().getRemoteUser());171 //Admin.notifyUser("WWWaaaremoteUSER:" + getServletRequest().getRemoteUser()); 173 172 if (getServletRequest().getRemoteUser() != null) { 174 Admin.notifyUser("WWWremoteUSER:" + getServletRequest().getRemoteUser());173 //Admin.notifyUser("WWWremoteUSER:" + getServletRequest().getRemoteUser()); 175 174 profilename = "WorkspaceProfile_" + getServletRequest().getRemoteUser() + ".xml"; 176 175 } else { … … 179 178 } else if (type.toLowerCase().equals(SERVER)) { 180 179 profilename = "WorkspaceProfileServer.xml"; 181 File f = new File( profilename);180 File f = new File(getBasePath() + profilename); 182 181 if (! f.exists()){ 182 //Admin.notifyUser(" not exists"); 183 183 profilename = "WorkspaceProfile_default.xml"; 184 184 }
Note: See TracChangeset
for help on using the changeset viewer.