Changeset 1966

Timestamp:

2006-02-06 20:42:36 (3 years ago)

Author:

ctford

Message:

Organise theme_annodex_control() so it is remotely readable and maintainable.

Files:

• Anode/trunk/acidfree/class_annodex.inc (modified) (4 diffs)

Anode/trunk/acidfree/class_annodex.inc

@@ -160 +160 @@
-
-        global $user;
+        $arg_name = "media";
-
-        /* Flag for determining whether to give option of editing clips */
-if (acidfree_access('update',$node)) {
-       $editing = TRUE
-
-editing && ($_POST['id'] || $_POST['start'] || $_POST['desc'])
+$editing = can_edit( $node );
+$mode = mode($arg_name)
+
+mode=="add" && $editing
-                try {
-                        insert_clip( $_POST, $node );   
@@ -171 +172 @@
-                        drupal_set_message( $e->getMessage(), 'error' );
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        
-
-
-
-
+
+
+
+
+
+
-                        $output .= clip_update_form( $node, null, "Add new clip" );
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        return $output;
@@ -388 +353 @@
-
-        $header = array();
+echo "file is "._acidfree_get_large_path($node)."<br>";
-        $header[] = array( 'data'=>'Title');
-        $header[] = array( 'data'=>'Duration');
@@ -461 +427 @@
-        return $output;
-}
+
+function select_media( $arg_name ) {
+
+        if( isset($_GET[$arg_name])) {
+                return $_GET[$arg_name];
+        } else {
+                return false;
+        }
+}
+
+function output_media( $media, $node ) {
+        switch ($media) {
+                case "cmml":
+                        output_cmml($node);
+                        die;
+                        break;
+                case "annodex":
+                        /* We need to call output() rather than 
+                         * output_annodex() because of apps like the
+                         * firefox extension that want both of them on
+                         * the one link.
+                         */
+                        output($node);
+                        die;
+                        break;
+                case "theora":
+                        output_ogg($node);
+                        die;
+                        break;
+                default:
+                        output($node);
+                        die;
+                        break;
+        }
+}
+
+function mode( $arg_name ) {
+
+        if( $_POST['id'] || $_POST['desc'] || $_POST['start_seconds']
+                || $_POST['start_minutes'] || $_POST['start_hours'] )
+                return "add";
+
+        if( $_GET['clip'] ) {
+                return "edit";
+        }
+
+        if( select_media( $arg_name ) ) {
+                return "media";
+        }
+
+        return "view";
+}
+
+function can_edit( $node ) {
+
+        if (acidfree_access('update',$node)) {
+                return TRUE;
+        } else {
+                return FALSE;
+        }
+}
+
+function view_header($node, $arg_name) {
+                                return headers($node, $arg_name);
+}
+
+function view_footer($node, $arg_name) {
+                                return footer($node, $arg_name);
+}
+