Changeset efe6202 in tol

Timestamp:

Jun 16, 2010, 7:03:19 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

77d8a87

Parents:

d1b9c9c2

Message:

Refs #916
Corrección de errores sintácticos y lógicos

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2266 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/stdlib/general/TolPackage

Files:

• client.tol (modified) (1 diff)
• common.tol (modified) (1 diff)
• repository.tol (modified) (13 diffs)

tol/stdlib/general/TolPackage/client.tol

@@ -84 +84 @@
 "Busca un paquete entre todos los repositorios consultables y si lo "
 "encuentra lo instala.";
-Real FindAndInstall(Text remote.repository)
+Real FindAndInstall(Text remote.repository, Real showError)
 //////////////////////////////////////////////////////////////////////////////
 {
-  @Repository::FindAndInstall(remote.repository)
+//WriteLn("TRACE Client::FindAndInstall(\""+remote.repository+"\","<<showError+")");
+  @Repository::FindAndInstall(remote.repository, showError)
 };
 

tol/stdlib/general/TolPackage/common.tol

@@ -19 +19 @@
   Set  authors,
   Text minTolVersion,
-  Text releaseDate,
+  Date releaseDate,
   Set  dependencies
 };

tol/stdlib/general/TolPackage/repository.tol

@@ -55 +55 @@
             "Loading list of available repositories from "+file);
     NameBlock @Repository::Get(
-      "http://packages.tol-project.org/tol_pkg/", False);
+      "http://packages.tol-project.org/OfficialTolArchiveNetwork/", False);
     Real If(FileExist(file),
     { 
@@ -96 +96 @@
     "//This repository is very recommendable. Please don't remove next line\n"
     "//Type: Public\n"
-    "  http://packages.tol-project.org/tol_pkg/\n"
+    "  http://packages.tol-project.org/OfficialTolArchiveNetwork/\n"
     "\n"); 
     Set EvalSet(_.instances,Real(@Repository r)
     {
-      Text If(r::_.url != "http://packages.tol-project.org/tol_pkg/",
+      Text If(r::_.url != "http://packages.tol-project.org/OfficialTolArchiveNetwork/",
       {
         AppendFile(file,
@@ -124 +124 @@
 //////////////////////////////////////////////////////////////////////////////
 {
+//WriteLn("TRACE @Repository::Get(\""+url+"\","<<connect+")");
   Real pos = FindIndexByName(@Repository::_.instances, ToName(url));
+//WriteLn("TRACE @Repository::Get 1 pos="<<pos);
   If(pos, 
   {
+  //WriteLn("TRACE @Repository::Get 2");
     Real If(connect, (_.instances[pos])::Connect(0));
     _.instances[pos]
   },
   {
+  //WriteLn("TRACE @Repository::Get 3");
     @Repository::Open(url, connect)
   })
@@ -180 +184 @@
   If(!_.isRemote,
   {
-    OSFilCopy(_.address+"packages/"+path,localPath)
+    OSFilCopy(_.address+"packages/"+packageName+".oza",localPath)
   },
   {
     //Hay que buscar una forma de copiar remoto sin wget, con el TCL
     OSCmdWait("wget -O\""+localPath+"\" \""+
-              _.url+"packages/"+path+"\"")
+              _.url+"packages/"+packageName+".oza\"")
   });
   FileExist(localPath)
@@ -197 +201 @@
   If(Not(IsUnknown(_.connected)), _.connected,
   {
+    WriteLn("[TolPackage::Client::@Repository::Connect] "
+      "Trying to conect to repository "+_.url+" ...");
     Real numErr0 = Copy(NError);
     Set repInf = IncludeText(GetFileContens("index.tol"));
@@ -204 +210 @@
     Text aux = GetFileContens("index.csv");
     Set line = Tokenizer(aux,"\n");
-    Set pckInf = For(2,Card(line), @PackageInfo(Real k)
+
+    Set cells.all = For(2,Card(line), Set(Real k)
     {
-      Set fields = Tokenizer(line[k],";","\"","\\");
-      Set aux = { [[ @PackageInfo(
-        Text repository = url,
-        Text name = fields[1],
-        Real version.high = Eval(fields[2]),
-        Real version.low = Eval(fields[3]),
-        Real name.version = Eval(fields[4]),
-        Text brief = fields[5],
-        Set keys =  Eval(fields[6]),
-        Set authors =  Eval(fields[7]),
-        Text minTolVersion = fields[8],
-        Text releaseDate = fields[9],
-        Set dependencies = Eval(fields[10])
+    //WriteLn("TRACE Connect line["<<k+"] = '"<<line[k]+"'");
+      Set fields = Tokenizer(line[k],";");
+    //WriteLn("TRACE Connect Card(fields) = "<<Card(fields));
+      fields
+    });
+    Set cells = Select(cells.all, Real(Set s) { Card(s)==11 });
+    Set pckInf = For(1,Card(cells), TolPackage::@PackageInfo(Real k)
+    {
+      Set fields = cells[k];
+      Set aux = { [[ TolPackage::@PackageInfo(
+        Text repository = fields[1],
+        Text name = fields[2],
+        Text name.version = fields[3],
+        Real version.high = Eval(fields[4]),
+        Real version.low = Eval(fields[5]),
+        Text brief = fields[6],
+        Set keys =  Eval(fields[7]),
+        Set authors =  Eval(fields[8]),
+        Text minTolVersion = fields[9],
+        Date releaseDate = Eval(fields[10]),
+        Set dependencies = Eval(fields[11])
       ) ]] };
       Set PutName(aux[1]->name.version,aux[1]);
       aux[1]
     });
-    Set _.index := Sort(pckInf,Real(@PackageInfo a, @PackageInfo b)
+
+    Set _.index := Sort(pckInf,Real(TolPackage::@PackageInfo a, TolPackage::@PackageInfo b)
     {
       Compare(b->name.version, a->name.version)
@@ -229 +245 @@
     Real SetIndexByName(_.index);
     Set Append(_.allPackages,_.index, True);
-    Set _.allPackages := Sort(_.allPackages,Real(@PackageInfo a, @PackageInfo b)
+    Set _.allPackages := Sort(_.allPackages,Real(TolPackage::@PackageInfo a, TolPackage::@PackageInfo b)
     {
       Compare(b->name.version, a->name.version)
     });
     Real numErr1 = Copy(NError);
-    _.connected := And(numErr1==numErr0,Card(_.index))
+    Real _.connected := And(numErr1==numErr0,Card(_.index));
+    If(_.connected, WriteLn(" ... Connected!"), 
+                    WriteLn(" ... NOT Connected!","W"));
+    _.connected
   })
 };
@@ -274 +293 @@
 //////////////////////////////////////////////////////////////////////////////
 {
+  WriteLn("[TolPackage::Client::@Repository::Install] "
+    "Trying to download package from "+_.url+package.version);
   Real DownloadPackage(package.version);
   Real ok = FileExist(TolPackage::Client::_.localRoot+package.version);
@@ -291 +312 @@
 //////////////////////////////////////////////////////////////////////////////
 {
-  SetMin(EvalSet(_.index, Real(@PackageInfo pi)
+  SetMin(EvalSet(_.index, Real(TolPackage::@PackageInfo pi)
   {
     DownloadPackage(pi->name.version)
@@ -305 +326 @@
 //////////////////////////////////////////////////////////////////////////////
 {
+  Set EvalSet(_.instances,Real(@Repository r)
+  {
+    If(!IsUnknown(r::_.connected), False, r::Connect(0))
+  });
   Real pos = FindIndexByName(_.allPackages,package.version);
-  If(pos<=0, Copy(Empty), _.allPackages[pos])
+  Set found = If(pos<=0, Copy(Empty), _.allPackages[pos]);
+  found
 };
 
@@ -316 +342 @@
 //////////////////////////////////////////////////////////////////////////////
 {
-  Set pkgInf = @Repository::Find(_.allPackages,package.version);
+//WriteLn("TRACE @Repository::FindAndInstall(\""+remote.repository+"\","<<showError+")");
+  Set pkgInf = @Repository::Find(package.version);
+//WriteLn("TRACE @Repository::FindAndInstall 1 Card(pkgInf)="<<Card(pkgInf));
   Case(
-  pos>0,
+  Card(pkgInf)>0,
   { 
+  //WriteLn("TRACE @Repository::FindAndInstall 2");
     @Repository r = @Repository::Get(pkgInf->repository, True);
-    r::Install(pkgInf->name)
+    r::Install(pkgInf->name, showError)
   },
   showError,
   { 
+  //WriteLn("TRACE @Repository::FindAndInstall 3");
     WriteLn("[TolPackage::FindAndInstall] "
     "Cannot find package "+package.version+" in available repositories","E");
@@ -331 +361 @@
   1==1,
   {
+  //WriteLn("TRACE @Repository::FindAndInstall 4");
     False
   })
@@ -371 +402 @@
 //////////////////////////////////////////////////////////////////////////////
 {
-  SetSum(EvalSet(_.index, Real(@PackageInfo pi)
+  SetSum(EvalSet(_.index, Real(TolPackage::@PackageInfo pi)
   {
     Upgrade(pi->name.version, caducityInDays)