Changeset 12896

Timestamp:

10/19/07 11:06:49 (1 year ago)

Author:

bergie

Message:

New feature: include required metadata fields to all schemas

Files:

• trunk/midcom/midcom.helper.datamanager2/config/config.inc (modified) (1 diff)
• trunk/midcom/midcom.helper.datamanager2/schema.php (modified) (5 diffs)

trunk/midcom/midcom.helper.datamanager2/config/config.inc

@@ -9 +9 @@
-'tinymce_use_compressor' => false,
-//'tinymce_default_config_snippet' => "{$GLOBALS['midcom_config']['midcom_sgconfig_basedir']}/midcom.helper.datamanager2/tinymce",
+
+'include_metadata_required' => false,

trunk/midcom/midcom.helper.datamanager2/schema.php

@@ -120 +120 @@
-
-    /**
+     * The schema database path as read by the system.
+     *
+     * @access private
+     * @var Array
+     */
+    var $_schemadb_path = null;
+
+    /**
-     * A simple array holding the fields in the order they should be rendered identified
-     * by their name.
@@ -172 +180 @@
-     * @see midcom_get_snippet_content()
-     */
-
-
-
-
+
+
+
+
+
-
-        $this->_load_schemadb($schemadb);
@@ -278 +287 @@
-            $data['name'] = $name;
-            $this->append_field($name, $data);
+        }
+        
+        if (   $this->_config->get('include_metadata_required')
+            && $this->_schemadb_path
+            && $this->_schemadb_path != $GLOBALS['midcom_config']['metadata_schema'])
+        {
+            // Include required fields from metadata schema to the schema
+            $metadata_schema = midcom_helper_datamanager2_schema::load_database($GLOBALS['midcom_config']['metadata_schema']);
+            if (isset($metadata_schema['metadata']))
+            {
+                $prepended = false;
+                foreach ($metadata_schema['metadata']->fields as $name => $field)
+                {
+
+                    if ($field['required'])
+                    {
+                        if (!$prepended)
+                        {   
+                            $field['static_prepend'] = "<h3 style='clear: left;'>" . $_MIDCOM->i18n->get_string('metadata', 'midcom') . "</h3>\n" . $field['static_prepend'];
+                            $prepended = true;
+                        }
+                        $this->append_field($name, $field);
+                    }
+                }
+            }
-        }
-    }
@@ -513 +547 @@
-    function load_database($raw_db)
-    {
+        $path = null;
-        if (is_string($raw_db))
-        {
+            $path = $raw_db;
-            $data = midcom_get_snippet_content($raw_db);
-            $result = eval ("\$raw_db = Array ( {$data}\n );");
@@ -529 +565 @@
-        foreach ($raw_db as $name => $raw_schema)
-        {
-
+, $path
-        }
-        return $schemadb;