Project

General

Profile

Bug #5516 » diff_submitting.txt

gastil gastil, 06/06/2012 08:40 PM

 
1
--- submitting.rst	2012-06-05 13:15:16.000000000 -0700
2
+++ submitting_mgb.rst	2012-06-06 20:36:40.000000000 -0700
3
@@ -32,7 +32,7 @@
4
 Using the Registry
5
 ------------------
6
 Metacat's optional Registry provides a simple Web-based interface for creating, 
7
-editing, and submitting metadata to the Metacat repository (Figure 4.1). The 
8
+editing, and submitting metadata to the Metacat repository (below screenshot). The 
9
 interface includes help documentation, and can be customized using Metacat's 
10
 configuration settings. The Registry also includes an administrative interface 
11
 for managing LDAP user accounts, which is useful if you are using LDAP as your 
12
@@ -495,7 +495,13 @@
13
 ``delete``
14
    Archive a document and move the pointer in xml_documents to xml_revisions, 
15
    effectively "deleting" the document from public view, but preserving the 
16
-   revision for the revision history.
17
+   revision for the revision history. No further updates will be allowed for
18
+   the Metacat document "deleted". All revisions of this identifier are no longer 
19
+   public. 
20
+
21
+.. warning::
22
+   It is not possible to "delete" one revision without "deleting" all 
23
+   revisions of a given identifier.
24
 
25
 The following is an example of a Web form (see figure) that can perform all 
26
 three tasks. Example HTML code is included in the sidebar.
27
@@ -548,10 +554,10 @@
28
    Metacat server.
29
  
30
 
31
-When Metacat receives a query via HTTP (Figure 4.8), the server creates a 
32
+When Metacat receives a query via HTTP (below screenshot), the server creates a 
33
 "pathquery" document, which is an XML document populated with the specified 
34
-search criteria (Figure 4.10). The pathquery document is then translated into 
35
-SQL statements that are executed against the data base. Results are translated 
36
+search criteria (pathquery example below). The pathquery document is then translated into 
37
+SQL statements that are executed against the database. Results are translated 
38
 into an XML "resultset" document, which can be returned as XML or transformed 
39
 into HTML and returned (specify which you would prefer with the returnfield 
40
 parameter). You can also opt to submit a pathquery document directly, 
41
@@ -560,7 +566,7 @@
42
 .. figure:: images/screenshots/image043.jpg
43
    :align: center
44
    
45
-   Example of a basic search form using a query action. 
46
+   Example of a basic search form using a query action. The HTML code used to create the form is displayed below.
47
 
48
 ::
49
 
50
@@ -602,23 +608,27 @@
51
       <meta_file_id>unspecified</meta_file_id>
52
       <querytitle>unspecified</querytitle>
53
       <returnfield>dataset/title</returnfield>
54
-      <returnfield>keyword</returnfield>
55
-      <returnfield>originator/individualName/surName</returnfield>
56
+      <returnfield>dataset/creator/individualName/surName</returnfield>
57
+      <returndoctype>eml://ecoinformatics.org/eml-2.1.0</returndoctype>
58
       <returndoctype>eml://ecoinformatics.org/eml-2.0.1</returndoctype>
59
       <returndoctype>eml://ecoinformatics.org/eml-2.0.0</returndoctype>
60
       <querygroup operator="UNION">
61
-        <queryterm casesensitive="false" searchmode="contains">
62
-          <value>Plant</value>
63
+        <queryterm casesensitive="true" searchmode="contains">
64
+          <value>Charismatic megafauna</value>
65
           <pathexpr>dataset/title</pathexpr>
66
         </queryterm>
67
-        <queryterm casesensitive="false" searchmode="contains">
68
-          <value>plant</value>
69
+        <queryterm casesensitive="false" searchmode="starts-with">
70
+          <value>sea otter</value>
71
           <pathexpr>keyword</pathexpr>
72
         </queryterm>
73
+        <queryterm casesensitive="false" searchmode="contains">
74
+          <value>Enhydra</value>
75
+          <pathexpr>abstract/para</pathexpr>
76
+        </queryterm>
77
       </querygroup>
78
   </pathquery>
79
   
80
-Each ``<returnfield>`` parameter specifies a field that the data base will 
81
+Each ``<returnfield>`` parameter specifies a field that the database will 
82
 return (in addition to the fields Metacat returns by default) for each search 
83
 result. 
84
 
85
@@ -650,44 +660,48 @@
86
             <meta_file_id>unspecified</meta_file_id>
87
             <querytitle>unspecified</querytitle>
88
             <returnfield>dataset/title</returnfield>
89
-            <returnfield>keyword</returnfield>
90
-            <returnfield>originator/individualName/surName</returnfield>
91
+            <returnfield>dataset/creator/individualName/surName</returnfield>
92
+            <returndoctype>eml://ecoinformatics.org/eml-2.1.0</returndoctype>
93
             <returndoctype>eml://ecoinformatics.org/eml-2.0.1</returndoctype>
94
             <returndoctype>eml://ecoinformatics.org/eml-2.0.0</returndoctype>
95
             <querygroup operator="UNION">
96
-                  <queryterm casesensitive="false" searchmode="contains">
97
-                      <value>Datos</value>
98
+                  <queryterm casesensitive="true" searchmode="contains">
99
+                      <value>Charismatic megafauna</value>
100
                       <pathexpr>dataset/title</pathexpr>
101
                   </queryterm>
102
-                  <queryterm casesensitive="false" searchmode="contains">
103
-                     <value>plant</value>
104
+                  <queryterm casesensitive="false" searchmode="starts-with">
105
+                     <value>sea otter</value>
106
                      <pathexpr>keyword</pathexpr>
107
                   </queryterm>
108
+                  <queryterm casesensitive="false" searchmode="contains">
109
+                     <value>Enhydra</value>
110
+                     <pathexpr>abstract/para</pathexpr>
111
+                  </queryterm>
112
            </querygroup>
113
          </pathquery>
114
         </query>  
115
       
116
         <document>
117
-          <docid>nceas.44.1</docid>
118
-          <docname>resource</docname>
119
-          <doctype>eml://ecoinformatics.org/eml-2.0.1</doctype>
120
-          <createdate>2001-01-12 16:12:06.0</createdate>
121
-          <updatedate>2001-01-12 16:12:06.0</updatedate>
122
-          <param name="dataset/title">Datos Meteorologicos</param>
123
-          <param name="keyword">intertidal</param>
124
-          <param name="originator/individualName/surName">Smith</param>
125
-        </document>  
126
-        
127
+          <docid>nrs.569.3</docid>
128
+          <docname>eml</docname>
129
+          <doctype>eml://ecoinformatics.org/eml-2.0.0</doctype>
130
+          <createdate>2012-06-06</createdate>
131
+          <updatedate>2012-06-06</updatedate>
132
+          <param name="dataset/title">Marine Mammal slides</param>
133
+          <param name="creator/individualName/surName">Bancroft</param>
134
+        </document>
135
+
136
         <document>
137
-          <docid>nceas.42.1</docid>
138
-          <docname>resource</docname>
139
-          <doctype>eml://ecoinformatics.org/eml-2.0.1</doctype>
140
-          <createdate>2001-01-12 16:11:31.0</createdate>
141
-          <updatedate>2001-01-12 16:11:31.0</updatedate>
142
-          <param name="dataset/title">Ocean Surface Temperature</param>
143
-          <param name="keyword">Plant</param>
144
-          <param name="originator/individualName/surName">Henry</param>   
145
-       </document>
146
+          <docid>knb-lter-sbc.61.1</docid>
147
+          <docname>eml</docname>
148
+          <doctype>eml://ecoinformatics.org/eml-2.1.0</doctype>
149
+          <createdate>2012-06-06</createdate>
150
+          <updatedate>2012-06-06</updatedate>
151
+          <param name="dataset/creator/individualName/surName">Nelson</param>
152
+          <param name="dataset/creator/individualName/surName">Harrer</param>
153
+          <param name="dataset/creator/individualName/surName">Reed</param>
154
+          <param name="dataset/title">SBC LTER: Reef: Sightings of Sea Otters (Enhydra lutris) near Santa Barbara and Channel Islands, ongoing since 2007</param>
155
+        </document>
156
       .....  
157
   </resultset>
158
 
(5-5/5)