Changeset 72625c3 in tol
- Timestamp:
- Oct 5, 2010, 1:48:36 PM (16 years ago)
- Branches:
- 1941-docker-image-to-test, devel, master
- Children:
- 51f1662
- Parents:
- 7d3cadb
- File:
-
- 1 edited
-
tol/lang/language.cpp (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
tol/lang/language.cpp
r7d3cadb r72625c3 1343 1343 BText package_version = package_version_; 1344 1344 BText package; 1345 //Std(BText("\nTRACE BPackage::Load 1 package_version='")+package_version+"'"); 1345 1346 BOisCreator::AddRequiredPackage(package_version); 1346 1347 int point = package_version.Find(".",1); … … 1348 1349 { 1349 1350 package = package_version.SubString(0,point-1); 1351 //Std(BText("\nTRACE BPackage::Load 2.1 package='")+package+"'"); 1350 1352 } 1351 1353 else … … 1357 1359 if(!lcv) { return(false); } 1358 1360 package_version = Text(lcv); 1361 //Std(BText("\nTRACE BPackage::Load 2.2.1 package='")+package_version+"'"); 1362 //Std(BText("\nTRACE BPackage::Load 2.2.2 package_version='")+package_version+"'"); 1359 1363 DESTROY(lcv); 1360 1364 } … … 1363 1367 if(ok) { return(pkg); } 1364 1368 BText path = LocalPath(package_version); 1369 //Std(BText("\nTRACE BPackage::Load 3 path='")+path+"'"); 1365 1370 BDir dirPath = path; 1371 //Std(BText("\nTRACE BPackage::Load 3 dirPath='")+dirPath.Name()+"'"); 1366 1372 if(!ok) 1367 1373 { 1368 1374 ok=dirPath.Exist(); 1369 if(!ok) { ok = Install(package_version); } 1375 //Std(BText("\nTRACE BPackage::Load 4 ok=")+ok); 1376 if(!ok) 1377 { 1378 ok = Install(package_version); 1379 //Std(BText("\nTRACE BPackage::Load 5 ok=")+ok); 1380 } 1370 1381 if(ok) 1371 1382 { 1383 //Std(BText("\nTRACE BPackage::Load 6 ")); 1372 1384 int oldLevel = BGrammar::Level(); 1373 1385 BGrammar::PutLevel(0); … … 1375 1387 if(aux && (aux->Grammar()==GraSet())) 1376 1388 { 1389 //Std(BText("\nTRACE BPackage::Load 7 ")); 1377 1390 BSet& set = Set(aux); 1378 1391 if((set.Card()==1)&&(set[1]->Grammar()==GraNameBlock())) 1379 1392 { 1393 //Std(BText("\nTRACE BPackage::Load 8 ")); 1380 1394 pkg = set[1]; 1381 1395 pkg->IncNRefs(); … … 1394 1408 } 1395 1409 } 1410 //Std(BText("\nTRACE BPackage::Load 9 ")); 1396 1411 BGrammar::PutLevel(oldLevel); 1397 1412 ok = pkg!=NULL; 1413 //Std(BText("\nTRACE BPackage::Load 10 ok=")+ok); 1398 1414 } 1399 1415 } 1400 1416 BText load = I2("Loaded","Ha sido cargado"); 1401 1417 BText help = ""; 1418 //Std(BText("\nTRACE BPackage::Load 11 ")); 1402 1419 if(!ok) 1403 1420 { 1421 //Std(BText("\nTRACE BPackage::Load 12 dirPath='")+dirPath.Name()+"'"); 1404 1422 if(!dirPath.Exist()) 1405 1423 {
Note: See TracChangeset
for help on using the changeset viewer.
