diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/amazon_import.admin.inc b/amazon_import.admin.inc index d745a1f..7fa0b2f 100644 --- a/amazon_import.admin.inc +++ b/amazon_import.admin.inc @@ -1,24 +1,49 @@ t('Please select')); +function amazon_import_get_field_field($type_name, $default_value){ $field_options = array('' => t('Please select')); + if (!empty($type_name)) { + $fields = field_info_instances('node', $type_name); + foreach($fields as $field_name => $field_value) { + $field_info = field_info_field($field_name); + if ($field_info['type'] == 'asin') { + $field_options[$field_info['field_name']] = $field_value['label']; + } + } + } + $form['amazon_import_field'] = array( + '#type' => 'select', + '#title' => t('Amazon ASIN field'), + '#default_value' => $default_value, + '#options' => $field_options, + '#description' => t('Choose the field used to store the Amazon ASIN code in.'), + '#required' => TRUE, + // The prefix/suffix provide the div that we're replacing, named by + // #ajax['wrapper'] above. + '#prefix' => '
', + '#suffix' => '
', + ); + return $form['amazon_import_field']; +} - foreach ($types as $type_name => $type) { - foreach ($type['fields'] as $field_name => $field ) { - $has_asin = FALSE; - if ($field['type'] == 'asin') { - $field_options[$field_name] = $field_name; - $has_asin = TRUE; - } - if ($has_asin) { - $type_options[$type_name] = $type['name']; +function amazon_import_settings_form($form, $form_state) { + $type_options = array('' => t('Please select')); + drupal_set_title(t('Amazon Import Settings')); + $types = node_type_get_types(); + foreach($types as $type_name => $type_value){ + $fields = field_info_instances('node', $type_name); + foreach($fields as $field_name => $field_value) { + $field_info = field_info_field($field_name); + if ($field_info['type'] == 'asin') { + $type_options[$type_name] = $type_value->name; } } } - + $form['amazon_import_type'] = array( '#type' => 'select', '#title' => t('Amazon Content Type'), @@ -26,15 +51,27 @@ function amazon_import_settings_form($form_state) { '#options' => $type_options, '#description' => t('Choose the content type to use to create amazon products.'), '#required' => TRUE, + '#ajax' => array( + 'callback' => 'amazon_import_ajax_fields', + 'wrapper' => 'amazon_import-fields', + 'method' => 'replace', + 'effect' => 'fade', + ), ); + + if (isset($form_state['values'])) { + $type = $form_state['values']['amazon_import_type']; + $default_value = $form_state['values']['amazon_import_field']; + } else { + $type = variable_get('amazon_import_type', ''); + $default_value = variable_get('amazon_import_field', ''); + } + $form['amazon_import_field'] = amazon_import_get_field_field($type, $default_value); - $form['amazon_import_field'] = array( - '#type' => 'select', - '#title' => t('Amazon ASIN field'), - '#default_value' => variable_get('amazon_import_field', ''), - '#options' => $field_options, - '#description' => t('Choose the field used to store the Amazon ASIN code in.'), - '#required' => TRUE, + $form['checkboxes_fieldset'] = array( + '#title' => t("Generated Checkboxes"), + '#type' => 'fieldset', + '#description' => t('Fields where data will be attached.'), ); $form['amazon_import_map_title'] = array( @@ -59,37 +96,5 @@ function amazon_import_settings_form($form_state) { '#default_value' => variable_get('amazon_import_cache_expire', 21600), '#options' => $period ); - - return system_settings_form($form); } - -/** - * Validation handler for amazon_settings_form(). - * Handles the file upload and making sure it happens correctly. - */ -function amazon_import_settings_form_validate($form, &$form_state) { - - $type_name = $form_state['values']['amazon_import_type']; - $field_name = $form_state['values']['amazon_import_field']; - - if (empty($type_name) || empty($field_name)) { - if (empty($type_name)) { - form_set_error('amazon_import_type', t("Please choose a type to use for Amazon Imports.")); - } - if (empty($field_name)) { - form_set_error('amazon_import_field', t("Please choose an ASIN field to use for Amazon Imports.")); - } - return; - } - - $field = content_fields($field_name, $type_name); - - if (empty($field)) { - form_set_error('amazon_import_field', t("Invalid or missing field.")); - } - elseif ($field['type'] != 'asin') { - form_set_error('amazon_import_field', t("Import field must be of ASIN type.")); - } - -} \ No newline at end of file diff --git a/amazon_import.info b/amazon_import.info index f244efe..d075303 100644 --- a/amazon_import.info +++ b/amazon_import.info @@ -1,5 +1,13 @@ -name = Amazon Import -description = Import products for Amazon +name = "Amazon Import" +description = "Import products for Amazon" package = "Amazon" +core = "7.x" -core = 6.x +dependencies[] ="amazon" +dependencies[] ="asin" + +#Amazon AWS Access Key ID * +#AKIAJWKNHYM7MWAZC2IQ + +#Amazon AWS Secret Access Key * +#Mjgu9fTXUEJR/pIJMOPRbfQ8QQmBnBd3jEN2Lzwp diff --git a/amazon_import.install b/amazon_import.install index 19ee51c..1f1bba0 100644 --- a/amazon_import.install +++ b/amazon_import.install @@ -6,11 +6,11 @@ * */ function amazon_import_install() { - drupal_install_schema('amazon_import'); + //drupal_install_schema('amazon_import'); } function amazon_import_uninstall() { - drupal_uninstall_schema('amazon_import'); + //drupal_uninstall_schema('amazon_import'); } function amazon_import_schema() { diff --git a/amazon_import.module b/amazon_import.module index 09bcf41..28289e9 100644 --- a/amazon_import.module +++ b/amazon_import.module @@ -27,10 +27,10 @@ function amazon_import_get_indices($index = NULL) { 'Video' => 'Video', 'VideoGames' => 'Video Games', ); - return $indices; } -function amazon_import_get_search_fields($index = 'All'){ + +function amazon_import_get_search_fields(){ $search_fields = array( 'Title' => t('Title'), 'Author' => t('Author'), @@ -62,22 +62,31 @@ function amazon_import_perm() { function amazon_import_menu() { - $items = array(); $tab_weight = 0; - - $items['admin/settings/amazon/import'] = array( - 'title' => t('Import'), + + $items['admin/config/amazon_import'] = array( + 'title' => 'Amazon Import', + 'description' => 'Settings page.', + 'page callback' => 'system_admin_menu_block_page', + 'file' => 'system.admin.inc', + 'file path' => drupal_get_path('module', 'system'), + 'access callback' => 'user_access', + 'access arguments' => array('access administration pages'), + 'type' => MENU_NORMAL_ITEM, + ); + $items['admin/config/amazon_import/settings'] = array( + 'title' => t('Import Settings'), 'description' => t('Settings for the Amazon Import module.'), 'page callback' => 'drupal_get_form', 'page arguments' => array('amazon_import_settings_form'), 'file' => 'amazon_import.admin.inc', 'access callback' => 'user_access', 'access arguments' => array('administer amazon'), - 'type' => MENU_LOCAL_TASK + 'type' => MENU_NORMAL_ITEM ); - $items['admin/content/amazon_import'] = array( + $items['admin/config/amazon_import/import'] = array( 'title' => 'Amazon item import', 'description' => t('Search for products on Amazon and import into nodes.'), 'page callback' => 'drupal_get_form', @@ -124,206 +133,172 @@ function amazon_import_menu() { ); } - return $items; } -function amazon_import_node_load($nid) { - $node = node_load($nid); - $type_name = variable_get('amazon_import_type', NULL); - $field_name = variable_get('amazon_import_field', NULL); - // Check if the node is of the correct type and the ASIN field is not empty. - if ($node->type == $type_name && !empty($node->{$field_name}[0])) { - $node->amazon_import_item = $node->{$field_name}[0]; - return $node; - } - return FALSE; -} - -/** - * Implementation of hook_flush_caches(). - */ -function amazon_import_flush_caches() { - return array('cache_amazon_import'); -} -/** - * Implementation of hook_theme() - */ -function amazon_import_theme() { - return array( - 'amazon_import_products' => array( - 'arguments' => array('form' => NULL), - ), - ); -} -/** +/* * Menu callback: content administration. */ -function amazon_import_page($form_state, $params = NULL, $show_search_form = TRUE) { +function amazon_import_page($form, $show_search_form = TRUE) { + //Define the form array. $form = array(); - - if (!empty($params)) { - $form_state['values'] = $params; - } - // Check for the presence of GET parameters. - elseif (empty($form_state['values'])) { - if (!empty($_GET)) { - $form_state['values'] = $_GET; - unset($form_state['values']['q']); - unset($form_state['values']['page']); - } + /* + * If we have not got parameters to work with, we try get them + * from url as GET parameters. + */ + $params = array(); + if (isset($_GET['aq'])) { + $params = $_GET['aq']; } - + # !!! Hide posibility if you have not configured module. + //Search form. if ($show_search_form) { - $form = $form + amazon_import_search_form($form_state, $type); + $form = $form + amazon_import_search_form($params); } - - if (!empty($form_state['values'])) { - $_amazon_search_params = amazon_import_search_params($form_state['values']); - $form['products'] = amazon_import_products($_amazon_search_params); - } - + //Product list. + $_amazon_search_params = amazon_import_search_params($params); + $form['products'] = amazon_import_products($_amazon_search_params); return $form; } -function amazon_import_products($search_params) { - if (empty($search_params)) { +//Get serch results, render them. +function amazon_import_products($params) { + //If we have not got parameters, go away. + if (empty($params)) { return FALSE; } - - $response_items = amazon_import_pager_query($search_params); - + + //Get search results. + $response_items = amazon_import_pager_query($params); if (empty($response_items)) { return FALSE; } - + + //Render answer. $form = amazon_import_products_form($response_items); - return $form; } -function amazon_import_products_form($search_items, $set_pager = TRUE) { - - if (empty($search_items)) { +//Render search results. +function amazon_import_products_form($search_params, $set_pager = TRUE) { + //If have not got any results, go away. + if (empty($search_params)) { return FALSE; } - // Convert items to array and prepare a lookup list. $items = array(); - $item_ids = array(); - foreach ($search_items as $key => $item) { - $items[$item['asin']] = (object) $item; - $item_ids[] = $item['asin']; - } - - - $form['options'] = array( - '#type' => 'fieldset', - '#title' => t('Import options'), - '#prefix' => '
', - '#suffix' => '
', - ); - - $form['options']['import'] = array( - '#type' => 'submit', - '#value' => t('Import'), - '#submit' => array('amazon_import_products_submit'), - ); - if (amazon_import_has_next_page()) { - $form['options']['import_continue'] = array( - '#type' => 'submit', - '#value' => t('Import and continue'), - '#submit' => array('amazon_import_products_submit'), - ); + //Get asin ids to check them in future. + $asin_list = array(); + foreach ($search_params['items'] as $key => $param) { + $items[$param['asin']] = (object)$param; + $asin_list[] = $param['asin']; } - + // Lookup asins against products. - $nodes = amazon_import_get_product_nodes($item_ids); - + $nodes = amazon_import_get_product_nodes($asin_list); $destination = drupal_get_destination(); + + $options = array(); foreach ($items as $key => $item) { - $nid = $nodes[$item->asin]; - - $options = array('attributes' => array('target' => '_blank')); - if (empty($nid)) { - $options['external'] = TRUE; - $can_import[$item->asin] = ''; - } + + //$nid = $nodes[$item->asin]; + // + $nid = False; + $option = array(); + //?can import - $link_url = !empty($nid) ? 'node/' . $nid : $item->detailpageurl; - $mark = !empty($nid) ? MARK_UPDATED : MARK_NEW; - $form['title'][$item->asin] = array( - '#value' => l($item->title, $link_url, $options), - '#prefix' => '
', - '#suffix' => '
' - ); - $form['price'][$item->asin] = array('#value' => check_plain($item->lowestpriceformattedprice)); + $option['link'] = !empty($nid)?'node/'.$nid:$item->detailpageurl; + $option['price'] = property_exists($item, 'lowestpriceformattedprice')?check_plain($item->lowestpriceformattedprice):''; // Set the Image. - $image = $item->imagesets['mediumimage']; - $image_url = $image['url']; - - if (!empty($image_url)) { - // Prevent images being too wide. + if (property_exists($item, 'imagesets')) { + $image = $item->imagesets['mediumimage']; + $image_url = $image['url']; $image_attributes = array('style' => 'max-width : 107px;'); - $form['image'][$item->asin] = array('#value' => theme('image', $image_url, $item->title, $item->title, $image_attributes, FALSE)); + $title = property_exists($item, 'title')?$item->title:''; + $option['image'] = theme('image', array( + 'path'=> $image_url, + 'title'=> $title, + 'alt'=> $title, + 'attributes' => $image_attributes, + )); + } else { + $option['image'] = ''; } - /* Prepare other fields */ - $fields = array(); - if (!empty($item->author) && is_array($item->author)) { - $fields[] = array('label' => '', 'value' => t('By @author', array('@author' => implode(", ", $item->author)))); + + $description_list = array(); + if (property_exists($item, 'author') && is_array($item->author)) { + $description_list[] = array('label' => '', 'value' => t('By @author', array('@author' => implode(", ", $item->author)))); } - elseif (!empty($item->artist) && is_array($item->artist)) { - $fields[] = array('label' => '', 'value' => t('By @artist', array('@artist' => implode(", ", $item->artist)))); + elseif (property_exists($item, 'artist') && is_array($item->artist)) { + $description_list[] = array('label' => '', 'value' => t('By @artist', array('@artist' => implode(", ", $item->artist)))); } - elseif (!empty($item->actor) && is_array($item->actor)) { - $fields[] = array('label' => t('Actor(s)'), 'value' => implode(", ", $item->actor)); + elseif (property_exists($item, 'actor') && is_array($item->actor)) { + $description_list[] = array('label' => t('Actor(s)'), 'value' => implode(", ", $item->actor)); } - if (!empty($item->publisher)) { - $fields[] = array('label' => t('Publisher'), 'value' => $item->publisher); + if (property_exists($item, 'publisher')) { + $description_list[] = array('label' => t('Publisher'), 'value' => $item->publisher); } - elseif (!empty($item->studio)) { - $fields[] = array('label' => t('Studio'),'value' => $item->studio); + elseif (property_exists($item, 'studio')) { + $description_list[] = array('label' => t('Studio'),'value' => $item->studio); } - if (!empty($item->binding)) { - $fields[] = array('label' => t('Binding'), 'value' => $item->binding); + if (property_exists($item, 'binding')) { + $description_list[] = array('label' => t('Binding'), 'value' => $item->binding); } - if (!empty($item->asin)) { - $fields[] = array('label' => t('ASIN'), 'value' => $item->asin); + if (property_exists($item, 'asin')) { + $description_list[] = array('label' => t('ASIN'), 'value' => $item->asin); } if ($nid) { - $fields[] = array('value' => l(t('Edit Node'), 'node/'. $nid .'/edit', array('query' => $destination))); + $description_list[] = array('value' => l(t('Edit Node'), 'node/'. $nid .'/edit', array('query' => $destination))); } - $form['fields'][$item->asin] = array( - '#prefix' => '
', - '#suffix' => '
' - ); - - foreach ($fields as $field) { - $form['fields'][$item->asin][] = array( - '#type' => 'item', + $fields = array(); + foreach ($description_list as $field) { + $fields[] = array( + '#type' => 'item', '#title' => $field['label'], - '#value' => $field['value'], + '#markup' => $field['value'], '#prefix' => '
', '#suffix' => '
' ); } + $option['information'] = render($fields); + $options[$item->asin] = $option; } - $form['import'] = array('#type' => 'checkboxes', '#options' => $can_import); - - if ($set_pager) { - // We want to clear the request to make urls nicer. - $old_request = $_REQUEST; - $_REQUEST = amazon_import_clean_query_params($_REQUEST); - - $form['pager'] = array('#value' => theme('pager', NULL, 10, 0)); - - // Restore $_REQUEST; - $_REQUEST = $old_request; + + //Theme table + $header = array( + 'image' => t(''), + 'information' => t('Information'), + 'price' => t('Price'), + ); + $form['table'] = array( + '#type' => 'tableselect', + '#header' => $header, + '#options' => $options, + ); + $form['pager'] = array('#markup' => theme('pager')); + //Optinal form. + $form['options'] = array( + '#type' => 'fieldset', + '#title' => t('Import options'), + '#prefix' => '
', + '#suffix' => '
', + ); + $form['options']['import'] = array( + '#type' => 'submit', + '#value' => t('Import'), + '#submit' => array('amazon_import_products_submit'), + ); + if (amazon_import_has_next_page()) { + $form['options']['import_continue'] = array( + '#type' => 'submit', + '#value' => t('Import and continue'), + '#submit' => array('amazon_import_products_submit'), + ); } - $form['#theme'] = 'amazon_import_products'; + return $form; } @@ -344,7 +319,6 @@ function amazon_import_versions($form_state, $node, $list_type = 'available') { if (!module_exists('amazon_versions')) { return FALSE; } - // Check for the presence of GET parameters. if (empty($form_state['values'])) { if (!empty($_GET)) { @@ -400,7 +374,7 @@ function amazon_import_versions($form_state, $node, $list_type = 'available') { */ function amazon_import_products_submit($form, &$form_state) { - $import_items = array_filter($form_state['values']['import']); + $import_items = array_filter($form_state['values']['table']); if (!empty($import_items)) { _amazon_import_bulk_import($import_items); } @@ -413,9 +387,10 @@ function amazon_import_products_submit($form, &$form_state) { } // Rebuild form $form_state['rebuild'] = TRUE; - } + +//Serach products on Amazon, return data, prepare pager. function amazon_import_pager_query($search_params, $element = 0, $custom_pager = array()) { global $pager_page_array, $pager_total, $pager_total_items; @@ -423,11 +398,8 @@ function amazon_import_pager_query($search_params, $element = 0, $custom_pager = $page = isset($_GET['page']) ? $_GET['page'] : ''; // Convert comma-separated $page to an array, used by other functions. $pager_page_array = explode(',', $page); - $current_page = !empty($custom_pager['current_page']) ? $custom_pager['current_page'] : $pager_page_array[$element] + 1; - $response = amazon_import_simple_search($search_params, $current_page); - $totalpages = !empty($custom_pager['totalpages']) ? $custom_pager['totalpages'] : $response['totalpages']; $totalresults = !empty($custom_pager['totalresults']) ? $custom_pager['totalresults'] : $response['totalresults']; @@ -435,10 +407,7 @@ function amazon_import_pager_query($search_params, $element = 0, $custom_pager = $pager_total_items[$element] = $totalresults; $pager_total[$element] = $totalpages; $pager_page_array[$element] = max(0, min((int)$pager_page_array[$element], ((int)$pager_total[$element]) - 1)); - - $items = $response['items']; - - return $items; + return $response; } function amazon_import_has_next_page($element = 0) { @@ -448,77 +417,71 @@ function amazon_import_has_next_page($element = 0) { return $total_pages > $current_page; } -function amazon_import_search_form($form_state, $type) { +//Make the search form. +function amazon_import_search_form($params) { $form['#cache'] = FALSE; - $form['SearchIndex'] = array( + //aq - Amazon Query + $form['aq']= array( + '#type' => 'container', + '#tree' => TRUE, + ); + $form['aq']['SearchIndex'] = array( '#type' => 'select', '#title' => t('Search Index'), '#options' => amazon_import_get_indices(), - '#default_value' => $form_state['values']['SearchIndex'] ? $form_state['values']['SearchIndex'] : 'Books', + '#default_value' => isset($params['SearchIndex'])?$params['SearchIndex']:'Books', ); - - $form['Binding'] = array( + $form['aq']['Binding'] = array( '#type' => 'select', '#title' => t('Item Binding (Books Only)'), - '#default_value' => $form_state['values']['Binding'], + '#default_value' => isset($params['Binding'])?$params['Binding']:'', '#options' => amazon_import_get_bindings(), ); - - $form['Keywords'] = array( - '#type' => 'textfield', - '#title' => 'Search', - '#default_value' => $form_state['values']['Keywords'], - '#size' => 60, - '#maxlength' => 127, - ); - $form['advanced'] = array( + $form['aq']['Keywords'] = array( + '#type' => 'textfield', + '#title' => 'Search', + '#default_value' => isset($params['Keywords'])?$params['Keywords']:'', + '#size' => 60, + '#maxlength' => 127, + ); + $form['aq']['advanced'] = array( '#type' => 'fieldset', '#title' => t('Advanced Options'), '#collapsible' => TRUE, ); - $search_fields = amazon_import_get_search_fields(); $collapsed = TRUE; foreach ($search_fields as $key => $label) { - $collapsed = empty($form_state['values'][$key]); - $form['advanced'][$key] = array( + $collapsed = empty($params[$key]); + $form['aq']['advanced'][$key] = array( '#type' => 'textfield', '#title' => check_plain($label), - '#default_value' => $form_state['values'][$key], + '#default_value' => isset($params[$key])?$params[$key]:'', '#size' => 60, '#maxlength' => 127, ); } - $form['advanced']['#collapsed'] = $collapsed; - - $form['Search'] = array( + $form['aq']['advanced']['#collapsed'] = $collapsed; + $form['aq']['Search'] = array( '#type' => 'submit', '#value' => 'Search', - '#submit' => array('amazon_import_search_submit'), ); - return $form; } /** * Process amazon_import_search form submissions. - * * Execute the chosen option on the selected product. */ -function amazon_import_search_submit($form, &$form_state) { - +function amazon_import_page_submit($form, &$form_state) { // Redirect form so we can have nice urls - $get = amazon_import_clean_query_params($form_state['values']); - $params = array(); - - foreach ($get as $key => $value) { - $params[] = $key . '=' . $value; - } - - $redirect[] = $_GET['q']; - $redirect[] = implode('&', $params); - - $form_state['redirect'] = $redirect; + //Check parameters. + $get = amazon_import_clean_query_params($form_state['values']['aq']); + unset($get['table']); + $form_state['redirect'] = array( + $_GET['q'], + array('query' => array('aq' => $get)), + ); } @@ -528,7 +491,7 @@ function amazon_import_search_params($form_values) { $valid = FALSE; foreach ($search_fields as $key => $searchfield) { - if ($form_values[$key]) { + if (isset($form_values[$key])) { $valid = TRUE; $search_params[$key] = $form_values[$key]; } @@ -547,54 +510,31 @@ function amazon_import_get_product_node($item_id, $field_name = NULL, $type_name return $products[$item_id]; } -function amazon_import_get_product_nodes($item_ids, $field_name = NULL, $type_name = NULL, $include_vid = FALSE) { - if (!is_array($item_ids)) { - $item_ids = array($item_ids); +//Get products from Drupal. +function amazon_import_get_product_nodes($asin_list, $field_name = NULL, $type_name = NULL) { + if (!is_array($asin_list || count($asin_list) == 0 )) { + $asin_list = array($asin_list); } - $products = array(); - - $field_name = !empty($field_name) ? $field_name : variable_get('amazon_import_field', NULL) ; - $type_name = !empty($type_name) ? $type_name : variable_get('amazon_import_type', NULL); - - $field = content_fields($field_name); - if (empty($field)) { - return FALSE; - } + //Get import parameters. + $type_name = $type_name != NULL?$type_name:variable_get('amazon_import_type', ''); + $field_name = $field_name != NULL?$field_name:variable_get('amazon_import_field', ''); - $placeholders = implode(', ', array_fill(0, sizeof($item_ids), "'%s'")); - $args = $item_ids; - $from = array(); - $where = array(); - - $db_info = content_database_info($field); - $table = $db_info['table']; - $column = $db_info['columns']['asin']['column']; - - $select = "SELECT p.$column as asin, n.nid as nid, n.vid as vid FROM {node} as n"; - $join = "LEFT JOIN {" . $table . "} AS p ON p.vid = n.vid"; - $where[] = 'p.' . $column . " IN ($placeholders)"; - if (!empty($type_name)) { - $where[] = "n.type = '%s'"; - $args[] = $type_name; - } - - $query = $select . "\n"; - $query .= $join . "\n"; - $query .= "WHERE (" . implode (") AND (", $where) . ")\n"; - - $result = db_query($query, $args); - - while ($node = db_fetch_object($result)) { - if ($include_vid) { - $products[$node->asin] = array('nid' => $node->nid, 'vid' => $node->vid); - } - else { - $products[$node->asin] = $node->nid; + //Get nodes that have been already imported to. + $query = new EntityFieldQuery(); + $result = $query->entityCondition('entity_type', 'node') + ->entityCondition('bundle', $type_name) + ->propertyOrderBy('created', 'DESC') + ->fieldCondition($field_name, 'asin', (array)$asin_list[0], 'IN') + ->execute(); + //Load nodes. + if (!empty($result['node'])) { + $nodes = entity_load('node', array_keys($result['node'])); + foreach ($nodes as $node) { + $products[] = $node; } - } - + // return $products; } @@ -606,10 +546,10 @@ function amazon_import_simple_search($parameters = array(), $page = 1, $force = 'SearchIndex' => 'Blended', ); $parameters['Keywords'] = urlencode($parameters['Keywords']); - if ($parameters['SearchIndex'] != 'Books') { + if (isset($parameters['SearchIndex']) && $parameters['SearchIndex'] != 'Books') { unset($parameters['Power']); } - if ($parameters['ASIN']) { + if (isset($parameters['ASIN'])) { $parameters['Operation'] = 'ItemLookup'; $parameters['ItemId'] = $parameters['ASIN']; unset($parameters['ASIN']); @@ -642,7 +582,6 @@ function amazon_import_simple_search($parameters = array(), $page = 1, $force = } return $result; - } @@ -681,114 +620,78 @@ function amazon_import_add_node($asin) { } } +//Create node. function amazon_import_create_node($item, $field_name, $type_name, $lookup = FALSE, $options = array()) { $nodes = amazon_import_create_nodes(array($item), $field_name, $type_name, $lookup, $options); return $nodes[$item]; } + +// - Create nodes according to the Amazon's search results. function amazon_import_create_nodes($items, $field_name, $type_name, $lookup = FALSE, $options = array()) { global $user; - $result = array(); - + //Item or array, use array. if (!array($items)) { $items = array($items); } - + //Try check existed items. if ($lookup) { $products = amazon_item_lookup($items); } - // Create the nodes foreach ($items as $asin) { $node = new stdClass(); $node->uid = $user->uid; $node->type = $type_name; - $node->{$field_name}[0]['asin'] = $asin; + $node->{$field_name}['und'][0]['asin'] = $asin; if ($lookup) { if ($options['set_title']) { $node->title = $products[$asin]['title']; } if ($options['set_body']) { - $node->body = $products[$asin]['editorialreviews'][0]['content']; + $node->body['und'][0] = array( + 'value' => $products[$asin]['editorialreviews'][0]['content'], + 'summary' => '', + 'format' => 'filtered_html', + ); } } + //Call hooks. drupal_alter('amazon_import_node', $node, $asin, $products[$asin]); node_save($node); module_invoke_all('amazon_import_node_save', $node, $asin); - + //Prepare results. if ($node->nid) { $result[$asin] = array('nid' => $node->nid, 'title' => $node->title); } } - if (!empty($result)) { return $result; } } + +//Import Amazon's items to drupal's nodes. function _amazon_import_bulk_import($items) { - $field_name = variable_get('amazon_import_field', NULL); - $type_name = variable_get('amazon_import_type', NULL); + //Get info where to import. + $field_name = variable_get('amazon_import_field', ''); + $type_name = variable_get('amazon_import_type', ''); + //Get info how to fill data into a node. $options = array( 'set_title' => variable_get('amazon_import_map_title', 0), 'set_body' => variable_get('amazon_import_map_body', 0), ); $lookup = $options['set_title'] || $options['set_body']; - + //Check if we can continue. if (empty($type_name) || empty($field_name)) { drupal_set_message(t('Please configure the import node type and ASIN field name in the Amazon Import @link.', array('@link', l(t('settings page'), 'admin/settings/amazon/import')))); return FALSE; } - + //Create nodes. $nodes = amazon_import_create_nodes($items, $field_name, $type_name, $lookup, $options); - + //Make notifications. foreach ($nodes as $asin => $node) { drupal_set_message(t('Amazon Product Created for @asin: @title.', array('@asin' => $asin, '@path' => url('node/' . $node['nid']), '@title' => $node['title'] . ' (nid:' . $node['nid'] . ')'))); } - } - -/** - * Theme node administration overview. - * - * @ingroup themeable - */ -function theme_amazon_import_products($form) { - // If there are rows in this form, then $form['title'] contains a list of - // the title form elements. - $has_posts = isset($form['title']) && is_array($form['title']); - $select_header = $has_posts ? theme('table_select_header_cell') : ''; - //$header = array($select_header, t('Cover'), t('Title'), t('Type'), t('Author'), t('Information')); - $header = array($select_header, t('Cover'), t('Information'), t('Price')); - $output = ''; - - $options = drupal_render($form['options']); - $output .= $options; - if ($has_posts) { - foreach (element_children($form['title']) as $key) { - $row = array(); - $row[] = drupal_render($form['import'][$key]); - $row[] = drupal_render($form['image'][$key]); - $row[] = drupal_render($form['title'][$key]) . drupal_render($form['fields'][$key]); - $row[] = drupal_render($form['price'][$key]); - $rows[] = $row; - } - - } - else { - $rows[] = array(array('data' => t('No products available.'), 'colspan' => '2')); - } - - $output .= theme('table', $header, $rows); - - $output .= $options; - - if ($form['pager']['#value']) { - $output .= drupal_render($form['pager']); - } - - $output .= drupal_render($form); - - return $output; -} \ No newline at end of file