? .DS_Store
? 665252.content_distribution.remove-menu-weights.patch
? 711332.content_distribution.move-nodequeue-support.patch
? _LIVE
? _patches
? modules/.DS_Store
? modules/content_retriever_process_upload
? modules/content_distribution_nodequeue/.DS_Store
Index: content_distribution.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/content_distribution/content_distribution.info,v
retrieving revision 1.1.2.1.2.1
diff -u -p -r1.1.2.1.2.1 content_distribution.info
--- content_distribution.info	9 Feb 2010 23:09:01 -0000	1.1.2.1.2.1
+++ content_distribution.info	11 Feb 2010 12:54:08 -0000
@@ -10,7 +10,5 @@ dependencies[] = distributor_service
 dependencies[] = system_service
 dependencies[] = user_service
 dependencies[] = node_service
-dependencies[] = nodequeue_service
 dependencies[] = views_service
 dependencies[] = views
-dependencies[] = nodequeue
Index: readme.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/content_distribution/readme.txt,v
retrieving revision 1.3.2.3.2.3
diff -u -p -r1.3.2.3.2.3 readme.txt
--- readme.txt	11 Feb 2010 11:36:05 -0000	1.3.2.3.2.3
+++ readme.txt	11 Feb 2010 12:54:09 -0000
@@ -92,7 +92,6 @@ Services setup
   	- node.get
   	- views.getViewObject
   	- views.get
-    - nodequeue.getQueues 
     - file.getNodeFiles
     - file.get
     (There may be others not documented here; if in doubt, enable all methods ;)
@@ -104,7 +103,6 @@ Services setup
     - distributor service module permissions
   	- file service module permissions
   	- node service module permissions
-  	- nodequeue_service module permissions
   	- services module permissions
   	- system_service module permissions
 
@@ -122,6 +120,8 @@ Services setup
  
  Example views are provided that you can use, but you can also set up your own
  view with appropriate arguments to do this.
+ Several helper modules are included to make picking argument values on the Retriever 
+ sites easier. These also include default views.
  
  The final argument of any view used for content distribution MUST be 'Node: Updated since date'.
  
@@ -134,24 +134,7 @@ Services setup
     - node updated
   etc...
   
-  For backwards compatibility with the 6.x-1.x branch of this module, one included
-  view has the arguments:
-    - nodequeue
-    - node type
-    - node updated
-    
  Some special considerations for setting up different arguments follow:
- 
- Nodequeue setup (optional)
- -----------------------
- - Set up Nodequeues in admin/content/nodequeue
- - nodequeues allow you to filter / target content to specific sites. Each remote site can be configured to receive (or not) content from the
- available nodequeues set-up on the 'content serving' site. For example site1.com might be receiving content from nodequeue 1 and nodequeue 2 whereas
- site2.com might only receive content from nodequeue 2.
- - You will need to add at least 1 queue. A typical example is you might want to set-up a queue for each remote site you have.
- This will allow content to be targetted to each of these sites individual. You might also want to have a queue which gets received by 'all' sites (for general content for example).
- - Enable 'Allow multiple terms per argument' on the view's nodequeue argument
-  so you can query several nodequeues at once. This is enabled on the example view.
 
  Node type setup (optional)
  -----------------------
Index: includes/content_distribution.views_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/content_distribution/includes/Attic/content_distribution.views_default.inc,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 content_distribution.views_default.inc
--- includes/content_distribution.views_default.inc	10 Feb 2010 14:05:37 -0000	1.1.2.3
+++ includes/content_distribution.views_default.inc	11 Feb 2010 12:54:09 -0000
@@ -9,34 +9,18 @@
  * Implementation of hook_views_default_views().
  */
 function content_distribution_views_default_views() {
-  // get list of all available queue ids to populate 'relationship'
-  // field of the view
-  $qids = nodequeue_get_all_qids(0,0);
-    
   $views = array();
     
   $view = new view;
-$view->name = 'content_distribution_queue';
-$view->description = 'Display a list of all nodes in queue \'Content Distribution Queue\'';
-$view->tag = 'nodequeue';
+$view->name = 'content_distribution';
+$view->description = 'Display a list of all nodes for distribution';
+$view->tag = 'content_distribution';
 $view->view_php = '';
 $view->base_table = 'node';
 $view->is_cacheable = FALSE;
 $view->api_version = 2;
 $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 $handler = $view->new_display('default', 'Defaults', 'default');
-$handler->override_option('relationships', array(
-  'nodequeue_rel' => array(
-    'label' => 'queue',
-    'required' => 1,
-    'limit' => 1,
-    'qids' => $qids,
-    'id' => 'nodequeue_rel',
-    'table' => 'node',
-    'field' => 'nodequeue_rel',
-    'relationship' => 'none',
-  ),
-));
 $handler->override_option('fields', array(
   'title' => array(
     'id' => 'title',
@@ -47,44 +31,7 @@ $handler->override_option('fields', arra
     'link_to_node' => 1,
   ),
 ));
-$handler->override_option('sorts', array(
-  'position' => array(
-    'id' => 'position',
-    'table' => 'nodequeue_nodes',
-    'field' => 'position',
-    'order' => 'ASC',
-    'relationship' => 'nodequeue_rel',
-  ),
-));
 $handler->override_option('arguments', array(
-  'qid' => array(
-    'default_action' => 'not found',
-    'style_plugin' => 'default_summary',
-    'style_options' => array(),
-    'wildcard' => 'all',
-    'wildcard_substitution' => 'All',
-    'title' => '',
-    'default_argument_type' => 'fixed',
-    'default_argument' => '',
-    'validate_type' => 'none',
-    'validate_fail' => 'not found',
-    'break_phrase' => 1,
-    'not' => 0,
-    'id' => 'qid',
-    'table' => 'nodequeue_nodes',
-    'field' => 'qid',
-    'relationship' => 'nodequeue_rel',
-    'default_options_div_prefix' => '',
-    'default_argument_user' => 0,
-    'default_argument_fixed' => '',
-    'default_argument_php' => '',
-    'validate_argument_node_type' => array(),
-    'validate_argument_node_access' => 0,
-    'validate_argument_nid_type' => 'nid',
-    'validate_argument_vocabulary' => array(),
-    'validate_argument_type' => 'tid',
-    'validate_argument_php' => '',
-  ),
   'type' => array(
     'default_action' => 'not found',
     'style_plugin' => 'default_summary',
@@ -174,7 +121,7 @@ $handler->override_option('access', arra
   'role' => array(),
   'perm' => '',
 ));
-$handler->override_option('title', 'Queue \'Content Distribution Queue\'');
+$handler->override_option('title', 'Content Distribution');
 $handler->override_option('use_pager', '1');
 $handler->override_option('use_more', 1);
 $handler->override_option('row_plugin', 'node');
@@ -183,7 +130,7 @@ $handler->override_option('row_options',
   'links' => 1,
 ));
 $handler = $view->new_display('page', 'Page', 'page');
-$handler->override_option('path', 'nodequeue/distribution');
+$handler->override_option('path', 'content_distribution');
 $handler->override_option('menu', array(
   'type' => 'none',
   'title' => '',
@@ -205,7 +152,7 @@ $handler->override_option('row_options',
   'inline' => array(),
   'separator' => '',
 ));
-$handler->override_option('block_description', 'Queue \'Content Distribution Queue\'');
+$handler->override_option('block_description', 'Content Distribution');
 $handler->override_option('block_caching', -1);
 
 
Index: modules/content_distribution_nodequeue/README.txt
===================================================================
RCS file: modules/content_distribution_nodequeue/README.txt
diff -N modules/content_distribution_nodequeue/README.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/content_distribution_nodequeue/README.txt	11 Feb 2010 12:54:09 -0000
@@ -0,0 +1,28 @@
+// $Id$
+
+Content distribution Nodequeue configuration notes
+========================================
+
+This is a module that assists with using a Nodequeue argument on your
+Distribution view. It is not necessary, but it provides a nicer UI for selecting
+the view arguments on a Retriever site, and a default view.
+
+The idea is that you would use nodequeues on the Distributor site to identify
+Retriever sites. Each nodequeue represents one Retriever site; putting a node 
+into a queue means that node should be distributed to that Retriever site.
+
+ Nodequeue setup on the Distributor site
+ -----------------------
+ - enable modules Nodequeue, Nodequeue Service
+ - Set up Nodequeues in admin/content/nodequeue
+ - nodequeues allow you to filter / target content to specific sites. Each remote site can be configured to receive (or not) content from the available nodequeues set-up on the 'content serving' site. For example site1.com might be receiving content from nodequeue 1 and nodequeue 2 whereas site2.com might only receive content from nodequeue 2.
+ - You will need to add at least 1 queue. A typical example is you might want to set-up a queue for each remote site you have.
+ This will allow content to be targetted to each of these sites individual. You might also want to have a queue which gets received by 'all' sites (for general content for example).
+ - Enable 'Allow multiple terms per argument' on the view's nodequeue argument
+  so you can query several nodequeues at once. This is enabled on the example view.
+- set permissions for your webservice user:
+  - 'get nodequeues'
+- services your API key must be set up to use:
+  - 'nodequeue.getQueues'
+  - 'nodequeue.getSubQueues'
+
Index: modules/content_distribution_nodequeue/content_distribution_nodequeue.content_retriever_arguments_process.inc
===================================================================
RCS file: modules/content_distribution_nodequeue/content_distribution_nodequeue.content_retriever_arguments_process.inc
diff -N modules/content_distribution_nodequeue/content_distribution_nodequeue.content_retriever_arguments_process.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/content_distribution_nodequeue/content_distribution_nodequeue.content_retriever_arguments_process.inc	11 Feb 2010 12:54:09 -0000
@@ -0,0 +1,61 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Contains our implementation of hook_content_retriever_views_arguments_process.
+ */
+
+/**
+ * Implementation of hook_content_retriever_views_arguments_process.
+ *
+ * Make nicer form widgets for the remote view arguments form.
+ *
+ * Modules implementing this hook should iterate over $view_arguments, and for
+ * argument types they know about, insert a form element into the $results array
+ * at the same key.
+ *
+ * @param $view_arguments
+ *  The arguments defined on the remote view.
+ *
+ * @param $results
+ *  An array into which to put form elements. This is prefilled with the same
+ *  keys as $view_arguments. Modules implementing this hook should place any
+ *  form elements they wish to contribute into this array, at the right key.
+ *  If an item is not NULL (ie, a prior implementing module has already added
+ *  data) then it should not be replaced.
+ *  The #default_value key will be set by the content_retriever module.
+ */
+function content_distribution_nodequeue_content_retriever_views_arguments_process($view_arguments, &$results) {
+  foreach ($view_arguments as $argument_id => $argument) {
+    // Do not consider any arguments that have already had their result filled in.
+    if (!is_null($results[$argument_id])) {
+      continue;
+    }
+    
+    $options = array();
+
+    // ----------------------------------------------------------------
+    // Nodequeue argument
+    if ($argument['table'] == 'nodequeue_nodes' && $argument['field'] == 'qid') {
+      $queues = content_retriever_xmlrpc('nodequeue.getQueues');
+
+      if ($queues) {
+        foreach ($queues as $queue) {
+          $options[$queue['qid']] = $queue['title'];
+        }
+        
+        $results[$argument_id] = array(
+          '#title' => t('Nodequeues to interrogate'),
+          '#type' => 'checkboxes',
+          '#options' => $options,
+        );
+      } 
+      else {
+        drupal_set_message(t('No nodequeues available.'));
+      }
+    }
+    
+  }
+}
+
Index: modules/content_distribution_nodequeue/content_distribution_nodequeue.info
===================================================================
RCS file: modules/content_distribution_nodequeue/content_distribution_nodequeue.info
diff -N modules/content_distribution_nodequeue/content_distribution_nodequeue.info
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/content_distribution_nodequeue/content_distribution_nodequeue.info	11 Feb 2010 12:54:09 -0000
@@ -0,0 +1,7 @@
+; $Id$
+name = Content distribution Nodequeue
+description = Facilitate using nodequeue arguments on the content distribution view. Enable on both Distributor and Retriever sites.
+package = Content Distribution
+dependencies[] = nodequeue
+dependencies[] = services
+core = 6.x
Index: modules/content_distribution_nodequeue/content_distribution_nodequeue.module
===================================================================
RCS file: modules/content_distribution_nodequeue/content_distribution_nodequeue.module
diff -N modules/content_distribution_nodequeue/content_distribution_nodequeue.module
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/content_distribution_nodequeue/content_distribution_nodequeue.module	11 Feb 2010 12:54:09 -0000
@@ -0,0 +1,15 @@
+<?php
+// $Id$
+/**
+ * @file content_distribution_nodequeue.module
+ */
+
+/**
+ * Implementation of hook_views_api().
+ */
+function content_distribution_nodequeue_views_api() {
+  return array(
+    'api' => 2,
+    'path' => drupal_get_path('module', 'content_distribution_nodequeue'),
+  );
+}
Index: modules/content_distribution_nodequeue/content_distribution_nodequeue.views_default.inc
===================================================================
RCS file: modules/content_distribution_nodequeue/content_distribution_nodequeue.views_default.inc
diff -N modules/content_distribution_nodequeue/content_distribution_nodequeue.views_default.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/content_distribution_nodequeue/content_distribution_nodequeue.views_default.inc	11 Feb 2010 12:54:09 -0000
@@ -0,0 +1,216 @@
+<?php
+// $Id$
+/**
+ * @file content_distribution_nodequeue.views_default.inc
+ * Defines default views for use with Nodequeue.
+ */
+
+/**
+ * Implementation of hook_views_default_views().
+ */
+function content_distribution_nodequeue_views_default_views() {
+  // get list of all available queue ids to populate 'relationship'
+  // field of the view
+  $qids = nodequeue_get_all_qids(0,0);
+    
+  $views = array();
+    
+  $view = new view;
+$view->name = 'content_distribution_queue';
+$view->description = 'Display a list of all nodes in queue \'Content Distribution Queue\'';
+$view->tag = 'content_distribution';
+$view->view_php = '';
+$view->base_table = 'node';
+$view->is_cacheable = FALSE;
+$view->api_version = 2;
+$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+$handler = $view->new_display('default', 'Defaults', 'default');
+$handler->override_option('relationships', array(
+  'nodequeue_rel' => array(
+    'label' => 'queue',
+    'required' => 1,
+    'limit' => 1,
+    'qids' => $qids,
+    'id' => 'nodequeue_rel',
+    'table' => 'node',
+    'field' => 'nodequeue_rel',
+    'relationship' => 'none',
+  ),
+));
+$handler->override_option('fields', array(
+  'title' => array(
+    'id' => 'title',
+    'table' => 'node',
+    'field' => 'title',
+    'label' => '',
+    'relationship' => 'none',
+    'link_to_node' => 1,
+  ),
+));
+$handler->override_option('sorts', array(
+  'position' => array(
+    'id' => 'position',
+    'table' => 'nodequeue_nodes',
+    'field' => 'position',
+    'order' => 'ASC',
+    'relationship' => 'nodequeue_rel',
+  ),
+));
+$handler->override_option('arguments', array(
+  'qid' => array(
+    'default_action' => 'not found',
+    'style_plugin' => 'default_summary',
+    'style_options' => array(),
+    'wildcard' => 'all',
+    'wildcard_substitution' => 'All',
+    'title' => '',
+    'default_argument_type' => 'fixed',
+    'default_argument' => '',
+    'validate_type' => 'none',
+    'validate_fail' => 'not found',
+    'break_phrase' => 1,
+    'not' => 0,
+    'id' => 'qid',
+    'table' => 'nodequeue_nodes',
+    'field' => 'qid',
+    'relationship' => 'nodequeue_rel',
+    'default_options_div_prefix' => '',
+    'default_argument_user' => 0,
+    'default_argument_fixed' => '',
+    'default_argument_php' => '',
+    'validate_argument_node_type' => array(),
+    'validate_argument_node_access' => 0,
+    'validate_argument_nid_type' => 'nid',
+    'validate_argument_vocabulary' => array(),
+    'validate_argument_type' => 'tid',
+    'validate_argument_php' => '',
+  ),
+  'type' => array(
+    'default_action' => 'not found',
+    'style_plugin' => 'default_summary',
+    'style_options' => array(),
+    'wildcard' => 'all',
+    'wildcard_substitution' => 'All',
+    'title' => '',
+    'default_argument_type' => 'fixed',
+    'default_argument' => '',
+    'validate_type' => 'none',
+    'validate_fail' => 'not found',
+    'id' => 'type',
+    'table' => 'node',
+    'field' => 'type',
+    'relationship' => 'none',
+    'default_options_div_prefix' => '',
+    'default_argument_user' => 0,
+    'default_argument_fixed' => '',
+    'default_argument_php' => '',
+    'validate_argument_node_type' => array(),
+    'validate_argument_node_access' => 0,
+    'validate_argument_nid_type' => 'nid',
+    'validate_argument_vocabulary' => array(),
+    'validate_argument_type' => 'tid',
+    'validate_argument_php' => '',
+  ),
+  'changed_since' => array(
+    'default_action' => 'ignore',
+    'style_plugin' => 'default_summary',
+    'style_options' => array(),
+    'wildcard' => 'all',
+    'wildcard_substitution' => 'All',
+    'title' => '',
+    'breadcrumb' => '',
+    'default_argument' => '',
+    'validate_type' => 'none',
+    'validate_fail' => 'not found',
+    'default_argument_type' => 'php',
+    'id' => 'changed_since',
+    'table' => 'node',
+    'field' => 'changed_since',
+    'validate_user_argument_type' => 'uid',
+    'relationship' => 'none',
+    'title' => '',
+    'default_action' => 'not found',
+    'wildcard' => '',
+    'wildcard_substitution' => '',
+    'default_options_div_prefix' => '',
+    'default_argument_user' => 0,
+    'default_argument_fixed' => '',
+    'default_argument_php' => '',
+    'validate_argument_node_type' => array(),
+    'validate_argument_node_access' => 0,
+    'validate_argument_nid_type' => 'nid',
+    'validate_argument_vocabulary' => array(),
+    'validate_argument_type' => 'tid',
+    'validate_argument_php' => '',
+  ),
+));
+$handler->override_option('filters', array(
+  'published_date' => array(
+    'operator' => '<=',
+    'value' => array(
+      'type' => 'offset',
+      'value' => 'now',
+      'min' => '',
+      'max' => '',
+    ),
+    'group' => '0',
+    'exposed' => FALSE,
+    'expose' => array(
+      'operator' => 'published_date_op',
+      'label' => 'Content Distribution: Published Date',
+      'use_operator' => 0,
+      'identifier' => 'published_date',
+      'optional' => 1,
+      'remember' => 0,
+    ),
+    'id' => 'published_date',
+    'table' => 'content_distribution',
+    'field' => 'published_date',
+    'relationship' => 'none',
+  ),
+));
+$handler->override_option('access', array(
+  'type' => 'none',
+  'role' => array(),
+  'perm' => '',
+));
+$handler->override_option('title', 'Queue \'Content Distribution Queue\'');
+$handler->override_option('use_pager', '1');
+$handler->override_option('use_more', 1);
+$handler->override_option('row_plugin', 'node');
+$handler->override_option('row_options', array(
+  'teaser' => 1,
+  'links' => 1,
+));
+$handler = $view->new_display('page', 'Page', 'page');
+$handler->override_option('path', 'content_distribution/nodequeue');
+$handler->override_option('menu', array(
+  'type' => 'none',
+  'title' => '',
+  'weight' => 0,
+  'name' => 'navigation',
+));
+$handler->override_option('tab_options', array(
+  'type' => 'none',
+  'title' => '',
+  'weight' => 0,
+));
+$handler = $view->new_display('block', 'Block', 'block');
+$handler->override_option('items_per_page', 5);
+$handler->override_option('style_plugin', 'list');
+$handler->override_option('style_options', array(
+  'type' => 'ul',
+));
+$handler->override_option('row_options', array(
+  'inline' => array(),
+  'separator' => '',
+));
+$handler->override_option('block_description', 'Queue \'Content Distribution Queue\'');
+$handler->override_option('block_caching', -1);
+
+
+     
+  
+  $views[$view->name] = $view;
+  return $views;
+}
Index: modules/content_retriever/content_retriever.content_retriever_arguments_process.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/content_distribution/modules/content_retriever/Attic/content_retriever.content_retriever_arguments_process.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 content_retriever.content_retriever_arguments_process.inc
--- modules/content_retriever/content_retriever.content_retriever_arguments_process.inc	10 Feb 2010 14:05:37 -0000	1.1.2.1
+++ modules/content_retriever/content_retriever.content_retriever_arguments_process.inc	11 Feb 2010 12:54:10 -0000
@@ -67,25 +67,5 @@ function content_retriever_content_retri
 	    );	  
     }
 
-    // ----------------------------------------------------------------
-    // Nodequeue argument
-    if ($argument['table'] == 'nodequeue_nodes' && $argument['field'] == 'qid') {
-      $queues = content_retriever_xmlrpc('nodequeue.getQueues');
-
-      if ($queues) {
-        foreach ($queues as $queue) {
-          $options[$queue['qid']] = $queue['title'];
-        }
-        
-        $results[$argument_id] = array(
-          '#title' => t('Nodequeues to interrogate'),
-          '#type' => 'checkboxes',
-          '#options' => $options,
-        );
-      } 
-      else {
-        drupal_set_message(t('No nodequeues available.'));
-      }
-    }
   }
 }
Index: modules/content_retriever/content_retriever.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/content_distribution/modules/content_retriever/content_retriever.module,v
retrieving revision 1.1.2.8.2.10
diff -u -p -r1.1.2.8.2.10 content_retriever.module
--- modules/content_retriever/content_retriever.module	11 Feb 2010 11:46:56 -0000	1.1.2.8.2.10
+++ modules/content_retriever/content_retriever.module	11 Feb 2010 12:54:10 -0000
@@ -426,7 +426,6 @@ function _content_retriever_save_file($f
  * string telling us what method to call, examples:
  *     - views.get
  *     - file.getNodeFiles
- *     - nodequeue.getQueues
  *     - node.get
  *     - image.getNodeImages
  * @param ...