X-Git-Url: http://git.rot13.org/?p=keramika-neolitik;a=blobdiff_plain;f=csv2js.pl;h=cdba38bb90662c8981552ca0630e7ae89279b82c;hp=1b5af4af741d7a7c0150add158c4e97e2867177f;hb=HEAD;hpb=b806859bbbcce84427a3e90537197b7354b39af7

diff --git a/csv2js.pl b/csv2js.pl
index 1b5af4a..cdba38b 100755
--- a/csv2js.pl
+++ b/csv2js.pl
@@ -28,19 +28,30 @@ foreach my $i ( @$aoh ) {
 		next;
 	}
 
-	system "convert -trim -geometry 400x $source $image";
+	#system "convert -trim -geometry 400x $source $image";
+	system qq{convert -fill white -draw "color 1,1 floodfill" -trim -geometry 400x $source $image};
 	#system "convert $image -scale 100x100 -gravity center -background white -extent 100x100 $thumb";
-	system qq{convert $source -fill white -draw "color 1,1 floodfill" -scale 100x100 -gravity center -background white -extent 100x100 $thumb};
+	system qq{convert $source -fill white -draw "color 1,1 floodfill" -scale 100x100 -gravity center -gravity south -background white -extent 100x100 $thumb};
 	$i->{image} = $image;
 	$i->{thumbnail} = $thumb;
 #	$i->{label} = $i->{opis_predmeta};
 	$i->{label} = $i->{ID};
 
-	my @ukrasi = split(/\s*,\s+|\s+i\s+/, $i->{ukras});
-	$i->{ukrasi_array} = [ @ukrasi ];
+	foreach my $name ( keys %$i ) {
+		if ( length($i->{$name}) == 0 || $i->{$name} =~ m{^(nema|n/a)$} ) {
+			delete $i->{$name};
+		}
+	}
+
+	if ( defined($i->{ukras}) ) {
+		my @ukrasi = split(/\s*,\s+|\s+i\s+/, $i->{ukras});
+		$i->{ukrasi_array} = [ @ukrasi ];
+	}
 
-	my @ocuvan = split(/\s*,\s+|\s+i\s+/, $i->{očuvan_dio_posude});
-	$i->{ocuvan_array} = [ @ocuvan ];
+	if ( defined($i->{očuvan_dio_posude} ) ) {
+		my @ocuvan = split(/\s*,\s+|\s+i\s+/, $i->{očuvan_dio_posude});
+		$i->{ocuvan_array} = [ @ocuvan ];
+	}
 
 	warn "# i = ",dump($i);
 	push @{ $json->{items} }, $i;