From 66862cc5f0db25e2c262882e00972ff07c401d4a Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Tue, 22 Oct 2013 10:31:23 +0200
Subject: [PATCH] distroquery: refine files search output and update
 translations

---
 po/distromatic.pot |  88 ++++++++++++++++++++++++++------------------
 po/it.gmo          | Bin 2067 -> 2297 bytes
 po/it.po           |  90 ++++++++++++++++++++++++++-------------------
 src/distroquery.c  |  33 ++++++++++++-----
 4 files changed, 128 insertions(+), 83 deletions(-)

diff --git a/po/distromatic.pot b/po/distromatic.pot
index 2b81d19..668bec3 100644
--- a/po/distromatic.pot
+++ b/po/distromatic.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: distromatic 1.4.1\n"
 "Report-Msgid-Bugs-To: silvan.calarco@mambasoft.it\n"
-"POT-Creation-Date: 2013-10-20 01:05+0200\n"
+"POT-Creation-Date: 2013-10-21 21:57+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,140 +17,156 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/distroquery.c:184
+#: src/distroquery.c:185
 msgid "Source"
 msgstr ""
 
-#: src/distroquery.c:249
+#: src/distroquery.c:266
 msgid "Search"
 msgstr ""
 
-#: src/distroquery.c:283
+#: src/distroquery.c:300
 msgid "sources"
 msgstr ""
 
-#: src/distroquery.c:287
+#: src/distroquery.c:304
 msgid "files"
 msgstr ""
 
-#: src/distroquery.c:299
+#: src/distroquery.c:315
 msgid "Search software packages"
 msgstr ""
 
-#: src/distroquery.c:404 src/distroquery.c:696 src/distroquery.c:918
+#: src/distroquery.c:364
+msgid "current path"
+msgstr ""
+
+#: src/distroquery.c:406
+msgid "Provider(s)"
+msgstr ""
+
+#: src/distroquery.c:542 src/distroquery.c:861 src/distroquery.c:1085
 msgid "Download"
 msgstr ""
 
-#: src/distroquery.c:413
+#: src/distroquery.c:551
 msgid "Details"
 msgstr ""
 
-#: src/distroquery.c:431 src/distroquery.c:467
+#: src/distroquery.c:570 src/distroquery.c:620
 #, c-format
 msgid "Other results in "
 msgstr ""
 
-#: src/distroquery.c:432 src/distroquery.c:468
+#: src/distroquery.c:571 src/distroquery.c:621
 #, c-format
 msgid "Results in"
 msgstr ""
 
-#: src/distroquery.c:435 src/distroquery.c:471
+#: src/distroquery.c:574 src/distroquery.c:624
 msgid "for arch "
 msgstr ""
 
-#: src/distroquery.c:444
+#: src/distroquery.c:587 src/distroquery.c:596
 msgid "provides"
 msgstr ""
 
-#: src/distroquery.c:480
-msgid "provides file "
+#: src/distroquery.c:637
+msgid "provides directory"
 msgstr ""
 
-#: src/distroquery.c:554
+#: src/distroquery.c:639
+msgid "provides symbolic link"
+msgstr ""
+
+#: src/distroquery.c:641
+msgid "provides file"
+msgstr ""
+
+#: src/distroquery.c:729
 msgid "result(s) shown"
 msgstr ""
 
-#: src/distroquery.c:556
+#: src/distroquery.c:731
 msgid "result(s) found"
 msgstr ""
 
-#: src/distroquery.c:578
+#: src/distroquery.c:753
 msgid "Search results for"
 msgstr ""
 
-#: src/distroquery.c:661 src/distroquery.c:880
+#: src/distroquery.c:826 src/distroquery.c:1047
 msgid "Version"
 msgstr ""
 
-#: src/distroquery.c:666
+#: src/distroquery.c:831
 msgid "Size"
 msgstr ""
 
-#: src/distroquery.c:669
+#: src/distroquery.c:834
 msgid "Related packages"
 msgstr ""
 
-#: src/distroquery.c:698 src/distroquery.c:920
+#: src/distroquery.c:863 src/distroquery.c:1087
 msgid "Developers details"
 msgstr ""
 
-#: src/distroquery.c:700
+#: src/distroquery.c:865
 msgid "Source package"
 msgstr ""
 
-#: src/distroquery.c:710 src/distroquery.c:712
+#: src/distroquery.c:875 src/distroquery.c:877
 msgid "Specfile"
 msgstr ""
 
-#: src/distroquery.c:715 src/distroquery.c:922
+#: src/distroquery.c:880 src/distroquery.c:1089
 msgid "Maintainer"
 msgstr ""
 
-#: src/distroquery.c:716 src/distroquery.c:923
+#: src/distroquery.c:881 src/distroquery.c:1090
 msgid "Build date"
 msgstr ""
 
-#: src/distroquery.c:720
+#: src/distroquery.c:891
 msgid "Obsoletes"
 msgstr ""
 
-#: src/distroquery.c:736
+#: src/distroquery.c:909
 msgid "Provides"
 msgstr ""
 
-#: src/distroquery.c:753
+#: src/distroquery.c:927
 msgid "Requires"
 msgstr ""
 
-#: src/distroquery.c:787
+#: src/distroquery.c:955
 msgid "Required in"
 msgstr ""
 
-#: src/distroquery.c:787
+#: src/distroquery.c:955
 msgid "by"
 msgstr ""
 
-#: src/distroquery.c:802
+#: src/distroquery.c:970
 msgid "Files list"
 msgstr ""
 
-#: src/distroquery.c:887
+#: src/distroquery.c:1054
 msgid "Built packages"
 msgstr ""
 
-#: src/distroquery.c:926
+#: src/distroquery.c:1093
 msgid "Source files"
 msgstr ""
 
-#: src/distroquery.c:936
+#: src/distroquery.c:1103
 msgid "Patches"
 msgstr ""
 
-#: src/distroquery.c:947
+#: src/distroquery.c:1114
 msgid "Build requirements"
 msgstr ""
 
-#: src/distroquery.c:961
+#: src/distroquery.c:1128
 msgid "Changelog"
 msgstr ""
diff --git a/po/it.gmo b/po/it.gmo
index 98c1e452c7d799bf2e76160be8fdff6b2a96d9dd..446d974cf5d2334bb46ea2c0a2c46c0d34084d61 100644
GIT binary patch
delta 1058
zcmYk5OK8+k6ozl-(V4NMcBX2rjvB3x7NjylDHJy<xNs**cY<jqrNMMEBvB|XMmHiN
zq6ATd;w(i$3f%~b3lSAu)lD}(Hr)v#ih?`8e;U+7&iU@Wx%a$olJx(sv_DmIcMNg>
zt)XXnj2VYFG8p7s)|hqBhE?dp4X_PM@Fpz4d+GZQEHYn$I`=%~8>s#7VFiAGoNJq}
z4Ek931$8i!Go~N*L9N%I)<>Wm)?qI^0+rBlxD`%89ur{nK89s@2`b@hP=4-0CES4-
z;+uyIwDB>_!>3T0zJNOL7Anv(Tn|^_7Wf@*ge4A%Lr{)K;VrsYhntwcB%2*@1rETU
zQ2tA7E)w4iFwlk?l!Hl(GCl^?fm7-HER+Ku;@ez?>c~~7L~p0>??V;zBwc@&&R;>D
zTZY@=3T&%&KN!eS8831)h*6~$ROMso`q7jpp+1k(P<J^6X@;4FN^lPHm@61{;5yWm
zK7iZcBGkEeMf$G*A6eir-!OE}>_R1b(EX@3D?y0@Np_+`s6JYqRmb+B5+$!I(KQXD
zgQyaaC_xD|BTm<LtI<g9;d;7%gXWUmYxrwbfx4!v(LM6rn!Tv5P}N$f+PfK5apfeR
z?c~CdXf#>KJ}NsG!q9ETR?CiOlM}h&v4$7AP8@{urWFPky@nfEGoJ7Mn?>_;(}C|f
zmhUysC(YbKp>7?nPmWJ4Rr8;F@^N4_?Bq-D>q^TFogj<?3#%AzvRF7c;oFvDhq3GX
dwwVdSrWZM`<@swt{$G%LEArNY1<7jR&>trXdyfDB

delta 840
zcmX}qODIH99LMp4x#o`X81FY@D2kf#T!^wzEU>kZvhb{_DLX8tWMf6$j17_!3n?iq
z6)R=K#)=gyD<#?a{$@^2o%^}xo^$^9fByIW7JH%OYl&~i(3<IW^qwqZqBxe#h34iM
zlZOE;!7?nwRt#Vt`f<q4kD|+X3bk+6nn0~z#bVq*_9ab<8*Mni5T0NVZ|w7XRG>%9
z#TQf}Z&-z2=))iv&4(}_D^ZEIpyGF<5*<LDZ5SQiZ$`LLX5*-Zlc<d|ScC~{5*1(z
zx2e)DmN9PQt@SvFr8tF(mq5i^vGePw{fDUdrx@h@=Gs2ELj`z32R~2&KJD{w)X4%w
z(enz_xDmC!18cDhRhbD?<rYxum$3lXP!-(7q$c+4f@4%^&XL2J3sgc^cK!kN?Vhdg
zs6an<K967&CjGJ+REuQzzcz5Es;M>U`>PbnR;`k*k}HX3x*CTzVY*JJvX;};bW$bP
zr~yq0D;b@beA1sp)zQCHP3JdBpI!&hf0k*?>aVZR$eYeN^a8#k@5UE#=9l7gVb68;
g{jqSYvp?2*dFH%jc`5&`x9GOJOYv}K#e*CD11G^jrvLx|

diff --git a/po/it.po b/po/it.po
index 8579f1b..80bd80a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: distromatic 1.4.1\n"
 "Report-Msgid-Bugs-To: silvan.calarco@mambasoft.it\n"
-"POT-Creation-Date: 2013-10-20 01:05+0200\n"
+"POT-Creation-Date: 2013-10-21 21:57+0200\n"
 "PO-Revision-Date: 2013-10-14 01:19+0200\n"
 "Last-Translator: Silvan Calarco <silvan.calarco@mambasoft.it>\n"
 "Language-Team: Italian\n"
@@ -17,140 +17,156 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/distroquery.c:184
+#: src/distroquery.c:185
 msgid "Source"
 msgstr "Sorgente"
 
-#: src/distroquery.c:249
+#: src/distroquery.c:266
 msgid "Search"
 msgstr "Cerca"
 
-#: src/distroquery.c:283
+#: src/distroquery.c:300
 msgid "sources"
 msgstr "sorgenti"
 
-#: src/distroquery.c:287
+#: src/distroquery.c:304
 msgid "files"
 msgstr "file"
 
-#: src/distroquery.c:299
+#: src/distroquery.c:315
 msgid "Search software packages"
 msgstr "Cerca pacchetti software"
 
-#: src/distroquery.c:404 src/distroquery.c:696 src/distroquery.c:918
+#: src/distroquery.c:364
+msgid "current path"
+msgstr "percorso corrente"
+
+#: src/distroquery.c:406
+msgid "Provider(s)"
+msgstr "Fornito da"
+
+#: src/distroquery.c:542 src/distroquery.c:861 src/distroquery.c:1085
 msgid "Download"
 msgstr "Scarica"
 
-#: src/distroquery.c:413
+#: src/distroquery.c:551
 msgid "Details"
 msgstr "Dettagli"
 
-#: src/distroquery.c:431 src/distroquery.c:467
+#: src/distroquery.c:570 src/distroquery.c:620
 #, c-format
 msgid "Other results in "
 msgstr "Altri risultati in "
 
-#: src/distroquery.c:432 src/distroquery.c:468
+#: src/distroquery.c:571 src/distroquery.c:621
 #, c-format
 msgid "Results in"
 msgstr "Risultati in"
 
-#: src/distroquery.c:435 src/distroquery.c:471
+#: src/distroquery.c:574 src/distroquery.c:624
 msgid "for arch "
 msgstr "per l'architettura "
 
-#: src/distroquery.c:444
+#: src/distroquery.c:587 src/distroquery.c:596
 msgid "provides"
 msgstr "fornisce"
 
-#: src/distroquery.c:480
-msgid "provides file "
-msgstr "fornisce il file "
+#: src/distroquery.c:637
+msgid "provides directory"
+msgstr "fornisce la cartella"
 
-#: src/distroquery.c:554
+#: src/distroquery.c:639
+msgid "provides symbolic link"
+msgstr "fornisce il link simbolico"
+
+#: src/distroquery.c:641
+msgid "provides file"
+msgstr "fornisce il file"
+
+#: src/distroquery.c:729
 msgid "result(s) shown"
 msgstr "risultati mostrati"
 
-#: src/distroquery.c:556
+#: src/distroquery.c:731
 msgid "result(s) found"
 msgstr "risultati trovati"
 
-#: src/distroquery.c:578
+#: src/distroquery.c:753
 msgid "Search results for"
 msgstr "Risultati della ricerca per"
 
-#: src/distroquery.c:661 src/distroquery.c:880
+#: src/distroquery.c:826 src/distroquery.c:1047
 msgid "Version"
 msgstr "Versione"
 
-#: src/distroquery.c:666
+#: src/distroquery.c:831
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/distroquery.c:669
+#: src/distroquery.c:834
 msgid "Related packages"
 msgstr "Pacchetti collegati"
 
-#: src/distroquery.c:698 src/distroquery.c:920
+#: src/distroquery.c:863 src/distroquery.c:1087
 msgid "Developers details"
 msgstr "Dettagli per gli sviluppatori"
 
-#: src/distroquery.c:700
+#: src/distroquery.c:865
 msgid "Source package"
 msgstr "Pacchetto sorgente"
 
-#: src/distroquery.c:710 src/distroquery.c:712
+#: src/distroquery.c:875 src/distroquery.c:877
 msgid "Specfile"
 msgstr "Specfile"
 
-#: src/distroquery.c:715 src/distroquery.c:922
+#: src/distroquery.c:880 src/distroquery.c:1089
 msgid "Maintainer"
 msgstr "Manutentore"
 
-#: src/distroquery.c:716 src/distroquery.c:923
+#: src/distroquery.c:881 src/distroquery.c:1090
 msgid "Build date"
 msgstr "Data di compilazione"
 
-#: src/distroquery.c:720
+#: src/distroquery.c:891
 msgid "Obsoletes"
 msgstr "Rende obsoleti"
 
-#: src/distroquery.c:736
+#: src/distroquery.c:909
 msgid "Provides"
 msgstr "Fornisce"
 
-#: src/distroquery.c:753
+#: src/distroquery.c:927
 msgid "Requires"
 msgstr "Richiede"
 
-#: src/distroquery.c:787
+#: src/distroquery.c:955
 msgid "Required in"
 msgstr "Richiesto in"
 
-#: src/distroquery.c:787
+#: src/distroquery.c:955
 msgid "by"
 msgstr "da"
 
-#: src/distroquery.c:802
+#: src/distroquery.c:970
 msgid "Files list"
 msgstr "Lista dei file"
 
-#: src/distroquery.c:887
+#: src/distroquery.c:1054
 msgid "Built packages"
 msgstr "Pacchetti compilati"
 
-#: src/distroquery.c:926
+#: src/distroquery.c:1093
 msgid "Source files"
 msgstr "File sorgenti"
 
-#: src/distroquery.c:936
+#: src/distroquery.c:1103
 msgid "Patches"
 msgstr "Patch"
 
-#: src/distroquery.c:947
+#: src/distroquery.c:1114
 msgid "Build requirements"
 msgstr "Requisiti per la compilazione"
 
-#: src/distroquery.c:961
+#: src/distroquery.c:1128
 msgid "Changelog"
 msgstr "Modifiche"
diff --git a/src/distroquery.c b/src/distroquery.c
index d79fe0e..98ace8d 100644
--- a/src/distroquery.c
+++ b/src/distroquery.c
@@ -579,22 +579,26 @@ void printQueryResponse() {
                        if (query_compact) {
                           printf("<a href='http://www.openmamba.org/distribution/search.html?"
                                  "repository=%s&package=%s&arch=%s&searchbox=true' style=\"color:black\" target='distroquery'>"
-                                 "%s</a> %s %s<br>",
+                                 "%s</a> (%s-%s) %s %s<br>",
                              query_repositories[i]->tag,
                              sqlite3_column_text(statement,sqlite3_find_column_id(statement, "packages", "name")),
                              query_repositories[i]->arch[a],
                              sqlite3_column_text(statement,sqlite3_find_column_id(statement, "packages", "name")),
+                             sqlite3_column_text(statement,sqlite3_find_column_id(statement, "packages", "version")),
+                             sqlite3_column_text(statement,sqlite3_find_column_id(statement, "packages", "release")),
                              _("provides"),
                              sqlite3_column_text(statement,sqlite3_find_column_id(statement, "provided", "name")));
                        } else {
                           printf("<a href=#reply onclick='distroquery_request("
-                              "\"repository=%s&package=%s&arch=%s\")' style=\"color:black;background-color:lightblue\">%s</a> %s %s<br>",
-                              query_repositories[i]->tag,
-                              sqlite3_column_text(statement,sqlite3_find_column_id(statement, "packages", "name")),
-                              query_repositories[i]->arch[a],
-                              sqlite3_column_text(statement,sqlite3_find_column_id(statement, "packages", "name")),
-                              _("provides"),
-                              sqlite3_column_text(statement,sqlite3_find_column_id(statement, "provided", "name")));
+                             "\"repository=%s&package=%s&arch=%s\")' style=\"color:black;background-color:lightblue\">%s</a> (%s-%s) %s %s<br>",
+                             query_repositories[i]->tag,
+                             sqlite3_column_text(statement,sqlite3_find_column_id(statement, "packages", "name")),
+                             query_repositories[i]->arch[a],
+                             sqlite3_column_text(statement,sqlite3_find_column_id(statement, "packages", "name")),
+                             sqlite3_column_text(statement,sqlite3_find_column_id(statement, "packages", "version")),
+                             sqlite3_column_text(statement,sqlite3_find_column_id(statement, "packages", "release")),
+                             _("provides"),
+                             sqlite3_column_text(statement,sqlite3_find_column_id(statement, "provided", "name")));
                        }
                     }
                  }
@@ -625,12 +629,21 @@ void printQueryResponse() {
                                 query_repositories[i]->arch[a]);
                              }
                              printf("<a href=#reply onclick='distroquery_request("
-                                 "\"repository=%s&package=%s&arch=%s\")' style=\"color:black;background-color:lightblue\">%s</a> %s %s<br>",
+                                 "\"repository=%s&package=%s&arch=%s\")' style=\"color:black;background-color:lightblue\">%s</a> (%s-%s)",
                                  query_repositories[i]->tag,
                                  sqlite3_column_text(stmt1,sqlite3_find_column_id(stmt1, "packages_files_rel", "name")),
                                  query_repositories[i]->arch[a],
                                  sqlite3_column_text(stmt1,sqlite3_find_column_id(stmt1, "packages_files_rel", "name")),
-                                 _("provides file "),
+                                 sqlite3_column_text(stmt1,sqlite3_find_column_id(stmt1, "packages_files_rel", "version")),
+                                 sqlite3_column_text(stmt1,sqlite3_find_column_id(stmt1, "packages_files_rel", "release")));
+                             k = sqlite3_column_int(stmt1,sqlite3_find_column_id(stmt1, "packages_files_rel", "flags"));
+                             if (k >> 12 & 4)
+                                printf(" %s ",_("provides directory"));
+                             else if (k >> 12 & 2)
+                                printf(" %s ",_("provides symbolic link"));
+                             else
+                                printf(" %s ",_("provides file"));
+                             printf("%s<br>",
                                  resolveFilePath(dbf, sqlite3_column_int(stmt1,sqlite3_find_column_id(stmt1, NULL, "id_file")), buffer));
                           }
                           sqlite3_finalize(stmt1);