lib/lipseys/catalog.rb in lipseys-2.0.6 vs lib/lipseys/catalog.rb in lipseys-2.0.7

@@ -106,22 +106,21 @@
       items
     end
 
     def map_hash(node)
       {
-        name: content_for(node, 'Model'),
+        name: content_for(node, 'Desc1'),
+        model: content_for(node, 'Model'),
         upc: content_for(node, 'UPC'),
-        short_description: content_for(node, 'Desc1'),
-        long_description: "#{content_for(node, 'Desc1')} #{content_for(node, 'Desc2')}",
+        short_description: content_for(node, 'Desc2'),
         category: content_for(node, 'Type'),
         price: nil,
         weight: content_for(node, 'Weight'),
         item_identifier: content_for(node, 'ItemNo'),
         brand: content_for(node, 'MFG'),
         mfg_number: content_for(node, 'MFGModelNo'),
         image_url: "http://www.lipseys.net/images/#{content_for(node, 'Image')}",
         features: {
-          model: content_for(node, 'Model'),
           caliber: content_for(node, 'Caliber'),
           action: content_for(node, 'Action'),
           barrel: content_for(node, 'Barrel'),
           capacity: content_for(node, 'Capacity'),
           finish: content_for(node, 'Finish'),