From 4744ff2e28512a27e044e972ed71c6da772c6a47 Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Fri, 21 Jan 2011 15:43:31 -0400 Subject: [PATCH] Added available datastreams to colleciton content model. --- CollectionClass.inc | 2 +- content_models/COLLECTIONCM.xml | 90 +- content_models/islandora_collectionCModel.xml | 860 +++++++++--------- 3 files changed, 522 insertions(+), 430 deletions(-) diff --git a/CollectionClass.inc b/CollectionClass.inc index 266f04e1..7e2b3626 100644 --- a/CollectionClass.inc +++ b/CollectionClass.inc @@ -445,7 +445,7 @@ class CollectionClass { $tabset['my_tabset']['third_tab']['tabset']['view'] = array( '#type' => 'tabpage', '#title' => t('View'), - '#content' => $dc_html . $ds_list, + '#content' => $dc_html . $ds_list . drupal_get_form('add_stream_form', $this->pid), ); if (fedora_repository_access(OBJECTHELPER :: $EDIT_FEDORA_METADATA, $this->pid, $user)) { diff --git a/content_models/COLLECTIONCM.xml b/content_models/COLLECTIONCM.xml index 85ed18d1..144dbad8 100644 --- a/content_models/COLLECTIONCM.xml +++ b/content_models/COLLECTIONCM.xml @@ -1 +1,89 @@ - text/xml text/plain application/xml The name given to the resource An entity primarily responsible for making the content of the resource such as a person, organization or service. An entity primarily responsible for making the content of the resource such as a person, organization or service. none Multi Media image meeting presentation sound text Examples include an abstract, table of contents, or free-text account of the content of the resource. An entity, (including persons, organizations, or services), responsible for making the resource available. An entity responsible for contributing to the content of the resource such as a person, organization or service. Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23) Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary. none collection dataset event image interactive resource model party physical object place service software sound text A reference to a resource from which the present resource is derived. A unique reference to the resource; In this instance, the accession number or collection number. The language of the intellectual content of the resource. English French Reference to a related resource. Information about intellectual property rights, copyright, and various property rights. \ No newline at end of file + + + + text/xml + text/plain + application/xml + + + + + + + + + + + + + + The name given to the resource + + + An entity primarily responsible for making the content of the resource such as a person, organization or service. + + + An entity primarily responsible for making the content of the resource such as a person, organization or service. + + none + Multi Media + image + meeting + presentation + sound + text + + + + Examples include an abstract, table of contents, or free-text account of the content of the resource. + + + An entity, (including persons, organizations, or services), responsible for making the resource available. + + + An entity responsible for contributing to the content of the resource such as a person, organization or service. + + + Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23) + + + Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary. + + none + collection + dataset + event + image + interactive resource + model + party + physical object + place + service + software + sound + text + + + + A reference to a resource from which the present resource is derived. + + + A unique reference to the resource; In this instance, the accession number or collection number. + + + The language of the intellectual content of the resource. + + English + French + + + + Reference to a related resource. + + + Information about intellectual property rights, copyright, and various property rights. + + + + diff --git a/content_models/islandora_collectionCModel.xml b/content_models/islandora_collectionCModel.xml index c8c7154a..330a62cf 100644 --- a/content_models/islandora_collectionCModel.xml +++ b/content_models/islandora_collectionCModel.xml @@ -5,11 +5,11 @@ - - + + - @@ -17,559 +17,563 @@ ingest - fedoraAdmin - 2009-02-24T14:23:47.169Z - Created with Admin GUI "New Object" command + admin + 2010-12-20T16:14:50.165Z + Fedora Object Ingested addDatastream - ISLANDORACM - fedoraAdmin - 2009-02-24T16:05:35.823Z - DatastreamsPane generated this logMessage. + RELS-EXT + admin + 2010-12-20T16:14:50.352Z + Ingested object RELS-EXT - ingest - - fedoraAdmin - 2009-03-31T18:10:17.791Z - Ingested from local file /Applications/MAMP/htdocs/f3/sites/all/modules/fedora_repository/installer_files/foxml/islandora-collectionCModel.xml + modifyDatastreamByValue + RELS-EXT + admin + 2010-12-20T16:14:50.407Z + Modified by Islandora API - purgeDatastream + addDatastream ISLANDORACM - fedoraAdmin - 2009-03-31T18:12:53.830Z - DatastreamPane generated this logMessage. . . . Purged datastream (ID=ISLANDORACM), versions ranging from 2009-02-24T12:05:35.823Z to 2009-02-24T12:05:35.823Z. This resulted in the permanent removal of 1 datastream version(s) (2009-02-24T12:05:35.823Z) and all associated audit records. + admin + 2010-12-20T16:14:50.475Z + Ingested object ISLANDORACM - ingest - - admin - 2010-01-05T20:29:36.835Z - Fedora Object Ingested + modifyDatastreamByValue + ISLANDORACM + fedoraAdmin + 2011-01-17T15:04:59.169Z + - addDatastream + modifyDatastreamByValue ISLANDORACM - admin - 2010-01-05T20:29:37.047Z - Ingested object ISLANDORACM + fedoraAdmin + 2011-01-17T15:06:08.023Z + modifyDatastreamByValue ISLANDORACM fedoraAdmin - 2010-05-05T14:23:39.206Z + 2011-01-21T19:40:39.790Z + + + + + modifyDatastreamByValue + ISLANDORACM + fedoraAdmin + 2011-01-21T19:41:19.709Z + + + + + Islandora Collection Content Model + islandora:collectionCModel + + + + - + + + + + + + + - + - + - - + + - - - This DS-COMPOSITE-MODEL datastream is included as a starting point to - assist in the creation of a content model. The DS-COMPOSITE-MODEL - should define the datastreams that are required for any objects - conforming to this content model. - For more information about content models, see: - http://fedora-commons.org/confluence/x/dgBI. - For examples of completed content model objects, see the demonstration - objects included with your Fedora distribution, such as: - demo:CMImage, demo:UVA_STD_IMAGE, demo:DualResImageCollection, - demo:TEI_TO_PDFDOC, and demo:XML_TO_HTMLDOC. - For more information about the demonstration objects, see: - http://fedora-commons.org/confluence/x/AwFI. - - -
- - + + + text/xml + text/plain + application/xml + + + + + + + The name given to the resource + + + An entity primarily responsible for making the content of the resource such as a person, organization or service. + + + An entity primarily responsible for making the content of the resource such as a person, organization or service. + + none + Multi Media + image + meeting + presentation + sound + text + + + + Examples include an abstract, table of contents, or free-text account of the content of the resource. + + + An entity, (including persons, organizations, or services), responsible for making the resource available. + + + An entity responsible for contributing to the content of the resource such as a person, organization or service. + + + Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23) + + + Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary. + + none + collection + dataset + event + image + interactive resource + model + party + physical object + place + service + software + sound + text + + + + A reference to a resource from which the present resource is derived. + + + A unique reference to the resource; In this instance, the accession number or collection number. + + + The language of the intellectual content of the resource. + + English + French + + + + Reference to a related resource. + + + Information about intellectual property rights, copyright, and various property rights. + + + + - - - + - - Islandora Collection Content Model - islandora:collectionCModel - + + + text/xml + text/plain + application/xml + + + + + + + + + + + + The name given to the resource + + + An entity primarily responsible for making the content of the resource such as a person, organization or service. + + + An entity primarily responsible for making the content of the resource such as a person, organization or service. + + none + Multi Media + image + meeting + presentation + sound + text + + + + Examples include an abstract, table of contents, or free-text account of the content of the resource. + + + An entity, (including persons, organizations, or services), responsible for making the resource available. + + + An entity responsible for contributing to the content of the resource such as a person, organization or service. + + + Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23) + + + Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary. + + none + collection + dataset + event + image + interactive resource + model + party + physical object + place + service + software + sound + text + + + + A reference to a resource from which the present resource is derived. + + + A unique reference to the resource; In this instance, the accession number or collection number. + + + The language of the intellectual content of the resource. + + English + French + + + + Reference to a related resource. + + + Information about intellectual property rights, copyright, and various property rights. + + + + - - - + + + + + text/xml + text/plain + application/xml + + + + + + + + + + + + The name given to the resource + + + An entity primarily responsible for making the content of the resource such as a person, organization or service. + + + An entity primarily responsible for making the content of the resource such as a person, organization or service. + + none + Multi Media + image + meeting + presentation + sound + text + + + + Examples include an abstract, table of contents, or free-text account of the content of the resource. + + + An entity, (including persons, organizations, or services), responsible for making the resource available. + + + An entity responsible for contributing to the content of the resource such as a person, organization or service. + + + Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23) + + + Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary. + + none + collection + dataset + event + image + interactive resource + model + party + physical object + place + service + software + sound + text + + + + A reference to a resource from which the present resource is derived. + + + A unique reference to the resource; In this instance, the accession number or collection number. + + + The language of the intellectual content of the resource. + + English + French + + + + Reference to a related resource. + + + Information about intellectual property rights, copyright, and various property rights. + + + + + + + - + text/xml text/plain application/xml - - - - text/xml - - - text/plain - - - application/xml - - - - + + + + + + + + + - - plugins/CollectionFormBuilder.php - CollectionFormBuilder - buildQDCForm - handleQDCForm - + - - - dc:title - textfield + The name given to the resource - true - - - dc:creator - textfield + An entity primarily responsible for making the content of the resource such as a person, organization or service. - false - - - dc:subject - select + An entity primarily responsible for making the content of the resource such as a person, organization or service. - false - - none - none - - - Multi Media - Multi Media - - - image - image - - - meeting - meeting - - - presentation - presentation - - - sound - sound - - - text - text - + none + Multi Media + image + meeting + presentation + sound + text - - - dc:description - textarea + Examples include an abstract, table of contents, or free-text account of the content of the resource. - true - - - dc:publisher - textfield + An entity, (including persons, organizations, or services), responsible for making the resource available. - false - - - dc:contributor - textfield + An entity responsible for contributing to the content of the resource such as a person, organization or service. - false - - - dc:date - textfield + Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23) - false - - - dc:type - select + Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary. - false - - none - none - - - collection - collection - - - dataset - dataset - - - event - event - - - image - image - - - interactive resource - interactive resource - - - model - model - - - party - party - - - physical object - physical object - - - place - place - - - service - service - - - software - software - - - sound - sound - - - text - text - + none + collection + dataset + event + image + interactive resource + model + party + physical object + place + service + software + sound + text - - - dc:source - textfield + A reference to a resource from which the present resource is derived. - false - - - dc:identifier - textfield + A unique reference to the resource; In this instance, the accession number or collection number. - false - - - dc:language - select + The language of the intellectual content of the resource. - false - - eng - English - - - fre - French - + English + French - - - dc:relation - textfield + Reference to a related resource. - false - - - dc:rights - textarea + Information about intellectual property rights, copyright, and various property rights. - false - + - + text/xml text/plain application/xml - - - - text/xml - - - text/plain - - - application/xml - - - - + + + + + + + + - - plugins/CollectionFormBuilder.inc - CollectionFormBuilder - buildQDCForm - handleQDCForm - + - - - dc:title - textfield + The name given to the resource - true - - - dc:creator - textfield + An entity primarily responsible for making the content of the resource such as a person, organization or service. - false - - - dc:subject - select + An entity primarily responsible for making the content of the resource such as a person, organization or service. - false - - none - none - - - Multi Media - Multi Media - - - image - image - - - meeting - meeting - - - presentation - presentation - - - sound - sound - - - text - text - + none + Multi Media + image + meeting + presentation + sound + text - - - dc:description - textarea + Examples include an abstract, table of contents, or free-text account of the content of the resource. - true - - - dc:publisher - textfield + An entity, (including persons, organizations, or services), responsible for making the resource available. - false - - - dc:contributor - textfield + An entity responsible for contributing to the content of the resource such as a person, organization or service. - false - - - dc:date - textfield + Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23) - false - - - dc:type - select + Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary. - false - - none - none - - - collection - collection - - - dataset - dataset - - - event - event - - - image - image - - - interactive resource - interactive resource - - - model - model - - - party - party - - - physical object - physical object - - - place - place - - - service - service - - - software - software - - - sound - sound - - - text - text - + none + collection + dataset + event + image + interactive resource + model + party + physical object + place + service + software + sound + text - - - dc:source - textfield + A reference to a resource from which the present resource is derived. - false - - - dc:identifier - textfield + A unique reference to the resource; In this instance, the accession number or collection number. - false - - - dc:language - select + The language of the intellectual content of the resource. - false - - eng - English - - - fre - French - + English + French - - - dc:relation - textfield + Reference to a related resource. - false - - - dc:rights - textarea + Information about intellectual property rights, copyright, and various property rights. - false