Metacat

Merged in the D1_0_6_2_BRANCH changes that include the transition from ObjectFormat calls to ObjectFormatCache calls.

include EML 2.1.1 documents in skin (path query search, mostly)

Merge 1.9.2 changes back into the trunk

I've added the PARC and PISCO organizations to the delete and confirm form templates for the data registry application.

I've added the PARC organization to the login form template.

I've replaced hard-coded URL strings in the PARC skin files with their appropriate variables in JSP, TT2, and XSL.

This updates the Registry login form to handle PARC logins. I've changed the template to load the PARC header and footer if the cfg = parc.

I'm adding two PARC-specific templates to the CGI templates directory. This is a temporary addition, since these templates should reside in the PARC skin. However, the NCEAS skin has templates in this location as well, and all four files will be relocated once bug #4573 has been resolved where the register and ldapweb CGIs change.

Further fixes to handle mixed-file uploads:
- set the fileCount object based on upCount existing files
- use ucount only if it exists; remove debugging'
- the entry form javascript now correctly tracks the file numbers, and can be relied on instead of using upCount...

fix bug #3950, make additional uploads stick when modifying a document