Project

General

Profile

« Previous | Next » 

Revision 8817

Fix XML validation errors in the metacatui confirmData template for the registry. Add a test script that submits multiple datasets to the registry.

View differences:

test/registry/results.txt
1
904a0e14a7f5fe9f0f7b6d9fa5756f6858dcf8b7,/var/metacat/temporary/tempaAxDUtestdata.csv,application/octet-stream,
0 2

  
test/registry/fileDetails.txt
1
904a0e14a7f5fe9f0f7b6d9fa5756f6858dcf8b7,/var/metacat/temporary/tempCjZvOtestdata.csv,application/octet-stream,
2
904a0e14a7f5fe9f0f7b6d9fa5756f6858dcf8b7,/var/metacat/temporary/tempujppLtestdata.csv,application/octet-stream,
3
904a0e14a7f5fe9f0f7b6d9fa5756f6858dcf8b7,/var/metacat/temporary/tempoU_ibtestdata.csv,application/octet-stream,
4
904a0e14a7f5fe9f0f7b6d9fa5756f6858dcf8b7,/var/metacat/temporary/temp3qI70testdata.csv,application/octet-stream,
5
904a0e14a7f5fe9f0f7b6d9fa5756f6858dcf8b7,/var/metacat/temporary/tempMcpHltestdata.csv,application/octet-stream,
0 6

  
test/registry/testdata.csv
1
1,4
+2,5
+3,6
test/registry/test-registry-submission.sh
1
#!/bin/sh
2

  
3
#  test-registry-submission.sh
4
#  
5
#
6
#  Created by Lauren Walker on 7/23/14.
7
#
8
# Replace the Cookie values or point to a file
9

  
10
> fileDetails.txt
11
> response.txt
12

  
13
counter="0"
14

  
15
while [ $counter -lt 5 ]
16
do
17
    curl -X POST --cookie "JSESSIONID=XXX;CGISESSID=XXX" --form file_0=@testdata.csv --form cfg=metacatui --form stage=insert --form providerGivenName=Lauren --form providerSurName=Walker --form "title=test registry with curl $counter" --form site=NCEAS --form origNamefirst0=walker --form origNamelast0=Walker --form abstract=abstract --form beginningYear=2014 --form geogdesc=Cali --form latDeg1=0 --form longDeg1=0 --form dataMedium=digital --form "useConstraints=no restrictions" --form useOrigAddress=on --form scope=test --form fileCount=1 "https://dev.nceas.ucsb.edu/knb/cgi-bin/register-dataset.cgi" -o response.txt
18

  
19
    upload=$(xmlstarlet sel -t -v "//input[@name='upload_0']/@value" response.txt)
20
    uploadname=$(xmlstarlet sel -t -v "//input[@name='uploadname_0']/@value" response.txt)
21
    uploadtype=$(xmlstarlet sel -t -v "//input[@name='uploadtype_0']/@value" response.txt)
22

  
23
    echo "$upload,$uploadname,$uploadtype," >> fileDetails.txt
24

  
25
    counter=$[$counter+1]
26
done
27

  
28
counter="0"
29

  
30
while [ $counter -lt 5 ]
31
do
32
    details=$(tail -n+$counter fileDetails.txt | head -n1)
33

  
34
    #Get the variables needed for the confirmation stage
35
    commaLoc=`gexpr index $details ","`
36
    upload=${details:0:commaLoc-1}
37

  
38
    details=${details:commaLoc}
39
    commaLoc=`gexpr index $details ","`
40
    uploadname=${details:0:commaLoc-1}
41

  
42
    details=${details:commaLoc}
43
    commaLoc=`gexpr index $details ","`
44
    uploadtype=${details:0:commaLoc-1}
45

  
46
    curl -X POST --cookie "JSESSIONID=XXX;CGISESSID=XXX" --form file_0=@testdata.csv --form cfg=metacatui --form stage=confirmed --form providerGivenName=Lauren --form providerSurName=Walker --form "title=test registry with curl $counter" --form site=NCEAS --form origNamefirst0=walker --form origNamelast0=Walker --form abstract=abstract --form beginningYear=2014 --form geogdesc=Cali --form latDeg1=0 --form longDeg1=0 --form dataMedium=digital --form "useConstraints=no restrictions" --form useOrigAddress=on --form scope=test --form fileCount=1 --form upCount=1 --form delCount=1 --form uploadperm_0=public --form upload_0=$upload --form uploadname_0=$uploadname --form uploadtype_0=$uploadtype "https://dev.nceas.ucsb.edu/knb/cgi-bin/register-dataset.cgi" &
47

  
48
    counter=$[$counter+1]
49
done
50

  
lib/style/common/templates/metacatui/confirmData.tmpl
1

  
1
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"   
2
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3
  
2 4
	<!-- CONTENT SECTION
3 5
    ======================================================================= -->
4 6
	<article id="RegistryEntryReview">
......
17 19
<tr><td align="left">
18 20
<a name="BasicInformation"></a>
19 21
<h4>Basic Information</h4>
20
</p>
21 22
<p><span class="text-info">First Name:</span>        [%providerGivenName%]
22 23
</p>
23 24
<p><span class="text-info">Last Name:</span>         [%providerSurName%]
......
40 41
    [% END %]
41 42
[% END %]
42 43

  
43
<hr class="rule">
44
<hr class="rule" />
44 45
<a name="DataSetOriginator"></a>
45 46
<h4>Principal Data Set Owner</h4>
46 47

  
......
81 82
<p><span class="text-info">Country:</span>               [%origCountry%]
82 83
</p>
83 84

  
84
<hr class="rule">
85
<hr class="rule" />
85 86
<a name="AdditionalOriginators"></a>
86 87
<h4>Associated Parties</h4> 
87 88

  
......
90 91
        [% numAO = aoCount %]
91 92
    [% END %]
92 93

  
94
</td>
95
</tr>
96
</table>
97

  
93 98
<table cellspacing="0" border="0" width="760">
94 99
    <tr> 
95 100
      <td width="21%" valign="TOP"> 
......
122 127
     [% END %]    
123 128
</table>
124 129

  
125
<hr class="rule">
130
<hr class="rule" />
126 131
<a name="DataSetAbstract"></a>
127 132
<h4>Data Set Abstract</h4>
128 133
<p>
129 134
[%abstract%]
130 135
</p>
131 136
 [% IF modules.keyword == 'true' %]
132
<hr class="rule">
137
<hr class="rule" />
133 138
<a name="KeywordInformation"></a>
134 139
<h4>Keyword Information</h4> 
135 140

  
......
172 177
[% END %]
173 178
  
174 179
[% IF modules.temporal == 'true' %]
175
<hr class="rule">
180
<hr class="rule" />
176 181
<a name="TemporalCoverageOfData"></a>
177 182
<h4>Temporal Coverage of Data</h4> 
178 183

  
179
<p><span class="text-info">Start Date:</span> [%beginningYear%]&nbsp;[%beginningMonth%]&nbsp;[%beginningDay%]
184
<p><span class="text-info">Start Date:</span> [%beginningYear%]\u00A0[%beginningMonth%]\u00A0[%beginningDay%]
180 185
</p>
181 186

  
182
<p><span class="text-info">Stop Date:</span>    [%endingYear%]&nbsp;[%endingMonth%]&nbsp;[%endingDay%]
187
<p><span class="text-info">Stop Date:</span>    [%endingYear%]\u00A0[%endingMonth%]\u00A0[%endingDay%]
183 188
</p>
184 189
[% END %]
185 190

  
186 191
[% IF modules.spatial == 'true' %]
187
<hr class="rule">
192
<hr class="rule" />
188 193
<a name="SpatialCoverageOfData"></a>
189 194
<h4>Spatial Coverage of Data</h4> 
190 195

  
......
208 213
    </tr>
209 214
    <tr> 
210 215
      <td width="18%" valign="TOP"> 
211
        <p><span class="text-info">&nbsp;Latitude</span></p>
216
        <p><span class="text-info">\u00A0Latitude</span></p>
212 217
      </td>
213 218
      <td width="20%" valign="TOP"> 
214
        <p><span class="text-info">&nbsp;North/South</span></p>
219
        <p><span class="text-info">\u00A0North/South</span></p>
215 220
      </td>
216 221
      <td width="20%" valign="TOP"> 
217
        <p><span class="text-info">&nbsp;Longitude</span></p>
222
        <p><span class="text-info">\u00A0Longitude</span></p>
218 223
      </td>
219 224
      <td width="42%" valign="TOP"> 
220
        <p><span class="text-info">&nbsp;West/East</span></p>
225
        <p><span class="text-info">\u00A0West/East</span></p>
221 226
      </td>
222 227
    </tr>
223 228
    <tr> 
224 229
      <td width="18%" valign="TOP"> 
225 230
        <p><font size="-1">
226
	[%latDeg1%]&nbsp;[%latMin1%]'&nbsp;[%latSec1%]&quot; 
231
	[%latDeg1%]\u00A0[%latMin1%]'\u00A0[%latSec1%]&quot; 
227 232
        </font></p>
228 233
      </td>
229 234
      <td width="20%" valign="TOP"> 
......
233 238
      </td>
234 239
      <td width="20%" valign="TOP"> 
235 240
        <p><font size="-1"> 
236
	  [%longDeg1%]&nbsp;[%longMin1%]'&nbsp;[%longSec1%]&quot; 
241
	  [%longDeg1%]\u00A0[%longMin1%]'\u00A0[%longSec1%]&quot; 
237 242
        </font></p>
238 243
      </td>
239 244
      <td width="42%" valign="TOP"> 
......
253 258
        <p><span class="text-info">Latitude</span></p>
254 259
      </td>
255 260
      <td width="20%" valign="TOP"> 
256
        <p><sapn class="text-info">&nbsp;North/South</span></p>
261
        <p><sapn class="text-info">\u00A0North/South</span></p>
257 262
      </td>
258 263
      <td width="20%" valign="TOP"> 
259 264
        <p><span class="text-info">Longitude</span></p>
......
265 270
    <tr>
266 271
      <td width="18%" valign="TOP"> 
267 272
        <p><font size="-1">
268
	[%latDeg2%]&nbsp;[%latMin2%]'&nbsp;[%latSec2%]&quot;
273
	[%latDeg2%]\u00A0[%latMin2%]'\u00A0[%latSec2%]&quot;
269 274
        </font></p>
270 275
      </td>
271 276
      <td width="20%" valign="TOP"> 
......
275 280
      </td>
276 281
      <td width="20%" valign="TOP"> 
277 282
        <p><font size="-1"> 
278
	  [%longDeg2%]&nbsp;[%longMin2%]'&nbsp;[%longSec2%]&quot; 
283
	  [%longDeg2%]\u00A0[%longMin2%]'\u00A0[%longSec2%]&quot; 
279 284
        </font></p>
280 285
      </td>
281 286
      <td width="42%" valign="TOP">
......
293 298
    [% IF taxaCount > 0 %]
294 299
        [% numTaxa = taxaCount %]
295 300
    [% END %]
296
    <hr class="rule">
301
    <hr class="rule" />
297 302
    <a name="Taxonomic Coverage"></a>
298 303
    <h4>Taxonomic Coverage of Data</h4>
299 304
    [% cnt = 1 %]
......
307 312
[% END %]
308 313

  
309 314
[% IF modules.method == 'true' %]
310
    <hr class="rule">
315
    <hr class="rule" />
311 316
    <a name="Methods"></a>
312 317
    <h4>Data Collection Methods</h4>
313 318
    <p><span class="text-info">Method Title:</span> [%methodTitle%]</p>
......
319 324
[% END %]
320 325

  
321 326
[% IF modules.upload == 'true' && upCount %]
322
   <hr class="rule">
327
   <hr class="rule" />
323 328
	 <a name="Upload Data"></a>
324 329
	  <h4>Upload Data</h4>
325 330
    
......
346 351
				</p>
347 352
    [% END %]
348 353
[% END %]
349
<hr class="rule">
354
<hr class="rule" />
350 355
<a name="DataSetContactAddress"></a>
351 356
<h4>Data Set Contact</h4> 
352 357

  
......
388 393
</p>
389 394

  
390 395

  
391
<hr class="rule">
396
<hr class="rule" />
392 397
<a name="DistributionIinformation"></a>
393 398
<h4>Distribution Information</h4> 
394 399

  
395
<a name=Site-specificCode></a>
400
<a name="Site-specificCode"></a>
396 401
<p><span class="text-info">Data Set Identifier:</span> [%identifier%]
397 402
</p>
398 403

  
399
<p><span class="text-info">Data Medium:</span>       [%dataMedium%]&nbsp;&nbsp;&nbsp;&nbsp;<span class="text-info">Other Data Medium</span>: [%dataMediumOther%]
404
<p><span class="text-info">Data Medium:</span>       [%dataMedium%]\u00A0\u00A0\u00A0\u00A0<span class="text-info">Other Data Medium</span>: [%dataMediumOther%]
400 405
</p>
401 406

  
402 407

  
403
<p><span class="text-info">Usage Constraints:</span>   [%useConstraints%]&nbsp;&nbsp;&nbsp;&nbsp;<span class="text-info">Other Usage Constraints:</span>  [%useConstraintsOther%]
408
<p><span class="text-info">Usage Constraints:</span>   [%useConstraints%]\u00A0\u00A0\u00A0\u00A0<span class="text-info">Other Usage Constraints:</span>  [%useConstraintsOther%]
404 409
</p>
405 410

  
406 411

  
......
408 413
</p>
409 414
<p><span class="text-info">Additional Information:</span>  [%addComments%]
410 415
</p>
411
<hr class="rule">
416
<hr class="rule" />
412 417

  
413 418
<form id="confirmForm" action="[% cgiPrefix %]/register-dataset.cgi" method="post">
414
  <input type="hidden" name="cfg" value="[% cfg %]">
415
  <input type="hidden" name="docid" value="[% docid %]">
416
  <input type="hidden" name="stage" value="confirmed">
417
  <input type="hidden" name="providerGivenName" value="[%providerGivenName%]">
418
  <input type="hidden" name="providerSurName" value="[%providerSurName%]">
419
  <input type="hidden" name="site" value="[%site%]">
419
  <input type="hidden" name="cfg" value="[% cfg %]" />
420
  <input type="hidden" name="docid" value="[% docid %]" />
421
  <input type="hidden" name="stage" value="confirmed" />
422
  <input type="hidden" name="providerGivenName" value="[%providerGivenName%]" />
423
  <input type="hidden" name="providerSurName" value="[%providerSurName%]"/>
424
  <input type="hidden" name="site" value="[%site%]"/>
420 425
  [% IF cfg == 'nceas' %]
421 426
      [% FOREACH group = wg %]
422
          <input type="hidden" name="wg" value="[%group%]">
427
          <input type="hidden" name="wg" value="[%group%]" />
423 428
      [% END %]
424 429
  [% END %]
425
  <input type="hidden" name="identifier" value="[%identifier%]">
426
  <input type="hidden" name="title" value="[%title%]">
427
  <input type="hidden" name="origNamefirst0" value="[%origNamefirst0%]">
428
  <input type="hidden" name="origNamelast0" value="[%origNamelast0%]">
429
  <input type="hidden" name="origNameOrg" value="[%origNameOrg%]">
430
  <input type="hidden" name="origRole0" value="[%origRole0%]">
431
  <input type="hidden" name="origDelivery" value="[%origDelivery%]">
432
  <input type="hidden" name="origCity" value="[%origCity%]"> 
433
  <input type="hidden" name="origState" value="[%origState%]">
434
  <input type="hidden" name="origStateOther" value="[%origStateOther%]">
435
  <input type="hidden" name="origZIP" value="[%origZIP%]">
436
  <input type="hidden" name="origCountry" value="[%origCountry%]">
437
  <input type="hidden" name="origPhone" value="[%origPhone%]">
438
  <input type="hidden" name="origFAX" value="[%origFAX%]">
439
  <input type="hidden" name="origEmail" value="[%origEmail%]">
440
  <input type="hidden" name="useOrigAddress" value="[%useOrigAddress%]">
441
  <input type="hidden" name="origNamefirstContact" value="[%origNamefirstContact%]">
442
  <input type="hidden" name="origNamelastContact" value="[%origNamelastContact%]">
443
  <input type="hidden" name="origNameOrgContact" value="[%origNameOrgContact%]">
444
  <input type="hidden" name="origDeliveryContact" value="[%origDeliveryContact%]">
445
  <input type="hidden" name="origCityContact" value="[%origCityContact%]"> 
446
  <input type="hidden" name="origStateContact" value="[%origStateContact%]">
447
  <input type="hidden" name="origStateOtherContact" value="[%origStateOtherContact%]">
448
  <input type="hidden" name="origZIPContact" value="[%origZIPContact%]">
449
  <input type="hidden" name="origCountryContact" value="[%origCountryContact%]">
450
  <input type="hidden" name="origPhoneContact" value="[%origPhoneContact%]">
451
  <input type="hidden" name="origFAXContact" value="[%origFAXContact%]">
452
  <input type="hidden" name="origEmailContact" value="[%origEmailContact%]">
453
  <input type="hidden" name="aoCount" value="[%aoCount%]">
430
  <input type="hidden" name="identifier" value="[%identifier%]" /> 
431
  <input type="hidden" name="title" value="[%title%]" />
432
  <input type="hidden" name="origNamefirst0" value="[%origNamefirst0%]" />
433
  <input type="hidden" name="origNamelast0" value="[%origNamelast0%]" />
434
  <input type="hidden" name="origNameOrg" value="[%origNameOrg%]" />
435
  <input type="hidden" name="origRole0" value="[%origRole0%]" />
436
  <input type="hidden" name="origDelivery" value="[%origDelivery%]" />
437
  <input type="hidden" name="origCity" value="[%origCity%]" /> 
438
  <input type="hidden" name="origState" value="[%origState%]" />
439
  <input type="hidden" name="origStateOther" value="[%origStateOther%]" />
440
  <input type="hidden" name="origZIP" value="[%origZIP%]" />
441
  <input type="hidden" name="origCountry" value="[%origCountry%]" />
442
  <input type="hidden" name="origPhone" value="[%origPhone%]" />
443
  <input type="hidden" name="origFAX" value="[%origFAX%]"/>
444
  <input type="hidden" name="origEmail" value="[%origEmail%]" />
445
  <input type="hidden" name="useOrigAddress" value="[%useOrigAddress%]" />
446
  <input type="hidden" name="origNamefirstContact" value="[%origNamefirstContact%]" />
447
  <input type="hidden" name="origNamelastContact" value="[%origNamelastContact%]" />
448
  <input type="hidden" name="origNameOrgContact" value="[%origNameOrgContact%]" />
449
  <input type="hidden" name="origDeliveryContact" value="[%origDeliveryContact%]" />
450
  <input type="hidden" name="origCityContact" value="[%origCityContact%]" /> 
451
  <input type="hidden" name="origStateContact" value="[%origStateContact%]" />
452
  <input type="hidden" name="origStateOtherContact" value="[%origStateOtherContact%]" />
453
  <input type="hidden" name="origZIPContact" value="[%origZIPContact%]"/>
454
  <input type="hidden" name="origCountryContact" value="[%origCountryContact%]" />
455
  <input type="hidden" name="origPhoneContact" value="[%origPhoneContact%]" />
456
  <input type="hidden" name="origFAXContact" value="[%origFAXContact%]" />
457
  <input type="hidden" name="origEmailContact" value="[%origEmailContact%]" />
458
  <input type="hidden" name="aoCount" value="[%aoCount%]" />
454 459
  [% cnt = 1 %]
455 460
  [% WHILE cnt <= numAO %]
456 461
      [% SET origNamefirst = "origNamefirst${cnt}" %]
457 462
      [% SET origNamelast = "origNamelast${cnt}" %]
458 463
      [% SET origRole = "origRole${cnt}" %]
459
      <input type="hidden" name="[% origNamefirst %]" value="[% $origNamefirst %]">
460
      <input type="hidden" name="[% origNamelast %]" value="[% $origNamelast %]">
461
      <input type="hidden" name="[% origRole %]" value="[% $origRole %]">
464
      <input type="hidden" name="[% origNamefirst %]" value="[% $origNamefirst %]" />
465
      <input type="hidden" name="[% origNamelast %]" value="[% $origNamelast %]" />
466
      <input type="hidden" name="[% origRole %]" value="[% $origRole %]" />
462 467
      [% cnt = cnt + 1 %]
463 468
  [% END %]
464
  <input type="hidden" name="abstract" value="[%abstract%]">
465
  <input type="hidden" name="keyCount" value="[%keyCount%]">
469
  <input type="hidden" name="abstract" value="[%abstract%]" />
470
  <input type="hidden" name="keyCount" value="[%keyCount%]" />
466 471
  [% cnt = 1 %]
467 472
  [% WHILE cnt <= numKey %]
468 473
      [% SET kyd = "keyword${cnt}" %]
469 474
      [% SET keyType = "kwType${cnt}" %]
470 475
      [% SET keyTh = "kwTh${cnt}" %]
471
      <input type="hidden" name="[% kyd %]" value="[% $kyd %]">
472
      <input type="hidden" name="[% keyType %]" value="[% $keyType %]">
473
      <input type="hidden" name="[% keyTh %]" value="[% $keyTh %]">
476
      <input type="hidden" name="[% kyd %]" value="[% $kyd %]" />
477
      <input type="hidden" name="[% keyType %]" value="[% $keyType %]" />
478
      <input type="hidden" name="[% keyTh %]" value="[% $keyTh %]" />
474 479
      [% cnt = cnt + 1 %]
475 480
  [% END %]
476
  <input type="hidden" name="addComments" value="[%addComments%]">
477
  <input type="hidden" name="useConstraints" value="[%useConstraints%]">
478
  <input type="hidden" name="useConstraintsOther" value="[%useConstraintsOther%]">
479
  <input type="hidden" name="url" value="[%url%]">
480
  <input type="hidden" name="dataMedium" value="[%dataMedium%]">
481
  <input type="hidden" name="dataMediumOther" value="[%dataMediumOther%]">
482
  <input type="hidden" name="beginningYear" value="[%beginningYear%]">
483
  <input type="hidden" name="beginningMonth" value="[%beginningMonth%]">
484
  <input type="hidden" name="beginningDay" value="[%beginningDay%]">
485
  <input type="hidden" name="endingYear" value="[%endingYear%]">
486
  <input type="hidden" name="endingMonth" value="[%endingMonth%]">
487
  <input type="hidden" name="endingDay" value="[%endingDay%]">
488
  <input type="hidden" name="geogdesc" value="[%geogdesc%]">
489
  <input type="hidden" name="useSiteCoord" value="[%useSiteCoord%]">
490
  <input type="hidden" name="latDeg1" value="[% latDeg1 %]">
491
  <input type="hidden" name="latMin1" value="[%latMin1%]">
492
  <input type="hidden" name="latSec1" value="[%latSec1%]">
493
  <input type="hidden" name="hemisphLat1" value="[%hemisphLat1%]">	
494
  <input type="hidden" name="longDeg1" value="[% longDeg1 %]">
495
  <input type="hidden" name="longMin1" value="[%longMin1%]">
496
  <input type="hidden" name="longSec1" value="[%longSec1%]">
497
  <input type="hidden" name="hemisphLong1" value="[%hemisphLong1%]">
498
  <input type="hidden" name="latDeg2" value="[%latDeg2%]">
499
  <input type="hidden" name="latMin2" value="[%latMin2%]">
500
  <input type="hidden" name="latSec2" value="[%latSec2%]">
501
  <input type="hidden" name="hemisphLat2" value="[%hemisphLat2%]">	
502
  <input type="hidden" name="longDeg2" value="[%longDeg2%]">
503
  <input type="hidden" name="longMin2" value="[%longMin2%]">
504
  <input type="hidden" name="longSec2" value="[%longSec2%]">
505
  <input type="hidden" name="hemisphLong2" value="[%hemisphLong2%]">
506
  <input type="hidden" name="taxaCount" value="[%taxaCount%]">
507
  <input type="hidden" name="userLoggedIn" value="[%userLoggedIn%]">
481
  <input type="hidden" name="addComments" value="[%addComments%]" />
482
  <input type="hidden" name="useConstraints" value="[%useConstraints%]" />
483
  <input type="hidden" name="useConstraintsOther" value="[%useConstraintsOther%]" />
484
  <input type="hidden" name="url" value="[%url%]" />
485
  <input type="hidden" name="dataMedium" value="[%dataMedium%]" />
486
  <input type="hidden" name="dataMediumOther" value="[%dataMediumOther%]" />
487
  <input type="hidden" name="beginningYear" value="[%beginningYear%]" />
488
  <input type="hidden" name="beginningMonth" value="[%beginningMonth%]" />
489
  <input type="hidden" name="beginningDay" value="[%beginningDay%]" />
490
  <input type="hidden" name="endingYear" value="[%endingYear%]" />
491
  <input type="hidden" name="endingMonth" value="[%endingMonth%]" />
492
  <input type="hidden" name="endingDay" value="[%endingDay%]" />
493
  <input type="hidden" name="geogdesc" value="[%geogdesc%]" />
494
  <input type="hidden" name="useSiteCoord" value="[%useSiteCoord%]" />
495
  <input type="hidden" name="latDeg1" value="[% latDeg1 %]" />
496
  <input type="hidden" name="latMin1" value="[%latMin1%]" />
497
  <input type="hidden" name="latSec1" value="[%latSec1%]" />
498
  <input type="hidden" name="hemisphLat1" value="[%hemisphLat1%]" />	
499
  <input type="hidden" name="longDeg1" value="[% longDeg1 %]" />
500
  <input type="hidden" name="longMin1" value="[%longMin1%]" />
501
  <input type="hidden" name="longSec1" value="[%longSec1%]" />
502
  <input type="hidden" name="hemisphLong1" value="[%hemisphLong1%]" />
503
  <input type="hidden" name="latDeg2" value="[%latDeg2%]" />
504
  <input type="hidden" name="latMin2" value="[%latMin2%]" />
505
  <input type="hidden" name="latSec2" value="[%latSec2%]" />
506
  <input type="hidden" name="hemisphLat2" value="[%hemisphLat2%]" />	
507
  <input type="hidden" name="longDeg2" value="[%longDeg2%]" />
508
  <input type="hidden" name="longMin2" value="[%longMin2%]" />
509
  <input type="hidden" name="longSec2" value="[%longSec2%]" />
510
  <input type="hidden" name="hemisphLong2" value="[%hemisphLong2%]" />
511
  <input type="hidden" name="taxaCount" value="[%taxaCount%]" />
512
  <input type="hidden" name="userLoggedIn" value="[%userLoggedIn%]" />
508 513
  [% cnt = 1 %]
509 514
  [% WHILE cnt <= numTaxa %]
510 515
      [% SET trn = "taxonRankName${cnt}" %]
511 516
      [% SET trv = "taxonRankValue${cnt}" %]
512
      <input type="hidden" name="[% trn %]" value="[% $trn %]">
513
      <input type="hidden" name="[% trv %]" value="[% $trv %]">
517
      <input type="hidden" name="[% trn %]" value="[% $trn %]" />
518
      <input type="hidden" name="[% trv %]" value="[% $trv %]" />
514 519
      [% cnt = cnt + 1 %]
515 520
  [% END %]
516
  <input type="hidden" name="taxaAuth" value="[%taxaAuth%]">
521
  <input type="hidden" name="taxaAuth" value="[%taxaAuth%]" />
517 522

  
518
  <input type="hidden" name="methodTitle" value="[%methodTitle%]">
523
  <input type="hidden" name="methodTitle" value="[%methodTitle%]" />
519 524
  [% FOREACH para = methodPara %]
520
      <input type="hidden" name="methodPara" value="[%para%]">
525
      <input type="hidden" name="methodPara" value="[%para%]" />
521 526
  [% END %]
522
  <input type="hidden" name="studyExtentDescription" value="[%studyExtentDescription%]">
523
  <input type="hidden" name="samplingDescription" value="[%samplingDescription%]">
524
  <input type="hidden" name="upCount" value="[%upCount%]">
525
  <input type="hidden" name="delCount" value="[% delCount %]">
527
  <input type="hidden" name="studyExtentDescription" value="[%studyExtentDescription%]" />
528
  <input type="hidden" name="samplingDescription" value="[%samplingDescription%]" />
529
  <input type="hidden" name="upCount" value="[%upCount%]" />
530
  <input type="hidden" name="delCount" value="[% delCount %]" />
526 531
  [% dCount = 0 %]
527 532
  [% IF delCount > 0 %]
528 533
     [% dCount = delCount %]
......
530 535
  [% cnt = 0 %]
531 536
  [% WHILE cnt < dCount %]
532 537
 		  [% SET delfile = "deletefile_${cnt}" %]
533
      <input type="hidden" name="[% delfile %]" value="[% $delfile %]">
534
			<input type="hidden" name="deletefile" value="[% $delfile %]">
538
      		<input type="hidden" name="[% delfile %]" value="[% $delfile %]" />
539
			<input type="hidden" name="deletefile" value="[% $delfile %]" />
535 540
			[% cnt = cnt + 1 %]
536 541
	[% END %]		
537 542

  
......
548 553
      [% SET filePerm = "uploadperm_${cnt}" %]
549 554

  
550 555
      [% IF fileSum %]
551
        <input type="hidden" name="[% fileSum %]" value="[% $fileSum %]">
552
        <input type="hidden" name="[% fileName %]" value="[% $fileName %]">
553
        <input type="hidden" name="[% fileType %]" value="[% $fileType %]">
554
        <input type="hidden" name="[% filePerm %]" value="[% $filePerm %]">
556
        <input type="hidden" name="[% fileSum %]" value="[% $fileSum %]" />
557
        <input type="hidden" name="[% fileName %]" value="[% $fileName %]" />
558
        <input type="hidden" name="[% fileType %]" value="[% $fileType %]" />
559
        <input type="hidden" name="[% filePerm %]" value="[% $filePerm %]" />
555 560
      [% END %]
556 561
      [% cnt = cnt + 1 %]
557 562
  [% END %]
......
559 564
  	<!-- form submission -->
560 565
	<a name="buttons"></a>
561 566
	<p><span class="text-info">Is the information above correct?</span></p> 
562
	<input id="dataCorrect" type="button" class="btn" value="     Yes, submit    " name="dataCorrect">
563
	<input id="dataWrongButton" type="button" class="btn" value="No, go back to editing">
564
	<input id="dataWrong" name="dataWrong" type="hidden" class="btn" value="TBD" >
567
	<input id="dataCorrect" type="button" class="btn" value="     Yes, submit    " name="dataCorrect" />
568
	<input id="dataWrongButton" type="button" class="btn" value="No, go back to editing" />
569
	<input id="dataWrong" name="dataWrong" type="hidden" class="btn" value="TBD" />
565 570

  
566 571
</form>
567 572

  
568
</td><tr></table>
569

  
570 573
[% IF userLoggedIn != 'true' %]
571 574

  
572 575
			<div class="row-fluid">
......
582 585
					</p>
583 586
  
584 587
					<form method="post" action="[% cgiPrefix %]/register-dataset.cgi" onsubmit="return submitform(this);" >
585
						<input type="hidden" name="stage" value="login"> 
586
						<input type="hidden" name="username" value=""> 
587
						<input type="hidden" name="cfg" value="[%cfg%]"> 
588
						<input type="hidden" name="stage" value="login" /> 
589
						<input type="hidden" name="username" value="" /> 
590
						<input type="hidden" name="cfg" value="[%cfg%]" /> 
588 591
					
589 592
						<div>
590 593
							<div class="row-fluid">
591 594
								<div class="span2 text-left">Username</div>
592
								<div class="span4 text-left"><input name="uid" type="text" value=""></div>
595
								<div class="span4 text-left"><input name="uid" type="text" value="" /></div>
593 596
							</div>
594 597
							<div class="row-fluid">
595 598
								<div class="span2 text-left">Organization</div>
......
612 615
							<div class="row-fluid">
613 616
								<div class="span2 text-left">Password</div>
614 617
								<div class="span4 text-left"><input name="password" type="password" maxlength="50"
615
									value=""></div>
618
									value="" /></div>
616 619
							</div>
617 620
							<div class="row-fluid">
618 621
								<div class="offset2 span4 text-left">
619
									<input type="submit" class="btn" name="loginAction" value="Login">
622
									<input type="submit" class="btn" name="loginAction" value="Login" />
620 623
								</div>
621 624
							</div>
622 625
						</div>

Also available in: Unified diff