[Gcstar-commits] r2281 - in /trunk/gcstar/lib/gcstar: GCModels/ GCPlugins/ GCPlugins/GCbuildingtoys/

[tian]

Author: tian
Date: Fri May 20 22:58:59 2016
New Revision: 2281

URL: http://svn.gna.org/viewcvs/gcstar?rev=2281&view=rev
Log:
Slight improvements on building toys model and plugin

Modified:
    trunk/gcstar/lib/gcstar/GCModels/GCbuildingtoys.gcm
    trunk/gcstar/lib/gcstar/GCPlugins/GCPluginsBase.pm
    trunk/gcstar/lib/gcstar/GCPlugins/GCbuildingtoys/GCBrickset.pm

Modified: trunk/gcstar/lib/gcstar/GCModels/GCbuildingtoys.gcm
URL: 
http://svn.gna.org/viewcvs/gcstar/trunk/gcstar/lib/gcstar/GCModels/GCbuildingtoys.gcm?rev=2281&r1=2280&r2=2281&view=diff
==============================================================================
--- trunk/gcstar/lib/gcstar/GCModels/GCbuildingtoys.gcm (original)
+++ trunk/gcstar/lib/gcstar/GCModels/GCbuildingtoys.gcm Fri May 20 22:58:59 2016
@@ -199,7 +199,13 @@
                                itemsPerRow="6"
                                pictureHeight="150"
                                imported="true"/>
-                       
+               <field value="instructions"
+                               type="file"
+                               format="ebook"
+                               label="Instructions"
+                               init=""
+                               group="details"
+                               imported="false"/>
        </fields>
 
        
@@ -249,18 +255,27 @@
                                        </item>
                                </item>
                                <item type="tab" value="details" 
title="Details">
-                                       <item type="table" rows="7" cols="5">
+                                       <item type="table" rows="7" cols="3">
                                                <item type="line" row="0" 
col="0" colspan="3">
                                                    <item type="value" 
for="case" />
                                                    <item type="value" 
for="manual" />
                                                    <item type="value" 
for="open" />
                                            </item>
                                                <item type="label" for="rating" 
row="1" col="0"/>
-                                               <item type="value" for="rating" 
row="1" col="1"/>
+                                               <item type="value" for="rating" 
row="1" col="1" colspan="2"/>
                                                <item type="label" for="added" 
row="2" col="0"/>
                                                <item type="value" for="added" 
row="2" col="1" colspan="2"/>                    
-                                               <item type="label" 
for="location" row="4" col="0"/>
-                                               <item type="value" 
for="location" row="4" col="1"/>
+                                               <item type="label" 
for="location" row="3" col="0"/>
+                                               <item type="value" 
for="location" row="3" col="1" colspan="2"/>
+                                               <item type="label" 
for="instructions" row="4" col="0"/>
+                                               <item type="line" row="4" 
col="1" colspan="2">                                          
+                                               <item type="value" 
for="instructions" nomargin="true" expand="true"/>                              
             
+                                           <item type="launcher" 
for="instructions" nomargin="true"/>
+                                           </item>
+                                       </item>
+                                       <item type="table" rows="2" cols="2" 
expand="true">
+                                               <item type="label" 
for="comments" row="1" col="0" colspan="2"/>
+                                               <item type="value" 
for="comments" row="2" col="0" colspan="2" expand="true"/>
                                        </item>
                                </item>
                                <item type="tab" value="minifigures" 
title="Minifigures">

Modified: trunk/gcstar/lib/gcstar/GCPlugins/GCPluginsBase.pm
URL: 
http://svn.gna.org/viewcvs/gcstar/trunk/gcstar/lib/gcstar/GCPlugins/GCPluginsBase.pm?rev=2281&r1=2280&r2=2281&view=diff
==============================================================================
--- trunk/gcstar/lib/gcstar/GCPlugins/GCPluginsBase.pm  (original)
+++ trunk/gcstar/lib/gcstar/GCPlugins/GCPluginsBase.pm  Fri May 20 22:58:59 2016
@@ -122,7 +122,6 @@
     sub loadPage
     {
         my ($self, $url, $post, $noSave) = @_;
-        print "LOADING $url\n";
         my $debugPhase = $ENV{GCS_DEBUG_PLUGIN_PHASE};
         my $debugFile;
         $debugFile = File::Spec->tmpdir.'/'.GCUtils::getSafeFileName($url)

Modified: trunk/gcstar/lib/gcstar/GCPlugins/GCbuildingtoys/GCBrickset.pm
URL: 
http://svn.gna.org/viewcvs/gcstar/trunk/gcstar/lib/gcstar/GCPlugins/GCbuildingtoys/GCBrickset.pm?rev=2281&r1=2280&r2=2281&view=diff
==============================================================================
--- trunk/gcstar/lib/gcstar/GCPlugins/GCbuildingtoys/GCBrickset.pm      
(original)
+++ trunk/gcstar/lib/gcstar/GCPlugins/GCbuildingtoys/GCBrickset.pm      Fri May 
20 22:58:59 2016
@@ -146,6 +146,13 @@
         }
         else
         {
+            $html =~ s|&lt;li&gt;|- |gm;
+            $html =~ s|&lt;p&gt;||gm;
+            $html =~ s|&lt;/p&gt;|\n|gm;
+            $html =~ s|&lt;ul&gt;||gm;
+            $html =~ s|&lt;/ul&gt;|\n|gm;
+            $html =~ s|&lt;/li&gt;|\n|gm;
+            $html =~ s|\t*||gm;
             $self->{curInfo}->{brand} = 'LEGO';
         }
         return $html;


_______________________________________________
GCstar-commits mailing list
GCstar-commits@gna.org
https://mail.gna.org/listinfo/gcstar-commits