Download as
Browse Code »

Commit 146b299771ccf9af0f45986b9615567b788f2b75

Authored by Eduardo Santos
1 parent a13b8b9c
Exists in master and in 1 other branch 3.1

Refatoração da coleta e melhorias de performance

Showing 5 changed files with 95 additions and 109 deletions   Show diff stats
composer.lock
  Diff comments   View file @146b299
... ... @@ -217,10 +217,9 @@
217 217 ],
218 218 "authors": [
219 219 {
220   - "name": "Jonathan H. Wage",
  220 + "name": "Jonathan Wage",
221 221 "email": "jonwage@gmail.com",
222   - "homepage": "http://www.jwage.com/",
223   - "role": "Creator"
  222 + "homepage": "http://www.jwage.com/"
224 223 },
225 224 {
226 225 "name": "Guilherme Blanco",
... ... @@ -292,7 +291,7 @@
292 291 ],
293 292 "authors": [
294 293 {
295   - "name": "Jonathan H. Wage",
  294 + "name": "Jonathan Wage",
296 295 "email": "jonwage@gmail.com",
297 296 "homepage": "http://www.jwage.com/",
298 297 "role": "Creator"
... ... @@ -434,8 +433,7 @@
434 433 {
435 434 "name": "Jonathan Wage",
436 435 "email": "jonwage@gmail.com",
437   - "homepage": "http://www.jwage.com/",
438   - "role": "Creator"
  436 + "homepage": "http://www.jwage.com/"
439 437 },
440 438 {
441 439 "name": "Guilherme Blanco",
... ... @@ -530,12 +528,12 @@
530 528 "source": {
531 529 "type": "git",
532 530 "url": "https://github.com/doctrine/dbal.git",
533   - "reference": "2a37b007dda8e21bdbb8fa445be8fa0064199e13"
  531 + "reference": "2.3.4"
534 532 },
535 533 "dist": {
536 534 "type": "zip",
537   - "url": "https://api.github.com/repos/doctrine/dbal/zipball/2a37b007dda8e21bdbb8fa445be8fa0064199e13",
538   - "reference": "2a37b007dda8e21bdbb8fa445be8fa0064199e13",
  535 + "url": "https://api.github.com/repos/doctrine/dbal/zipball/2.3.4",
  536 + "reference": "2.3.4",
539 537 "shasum": ""
540 538 },
541 539 "require": {
... ... @@ -561,8 +559,7 @@
561 559 {
562 560 "name": "Jonathan Wage",
563 561 "email": "jonwage@gmail.com",
564   - "homepage": "http://www.jwage.com/",
565   - "role": "Creator"
  562 + "homepage": "http://www.jwage.com/"
566 563 },
567 564 {
568 565 "name": "Guilherme Blanco",
... ... @@ -595,25 +592,25 @@
595 592 "source": {
596 593 "type": "git",
597 594 "url": "https://github.com/doctrine/DoctrineBundle.git",
598   - "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9"
  595 + "reference": "v1.2.0"
599 596 },
600 597 "dist": {
601 598 "type": "zip",
602   - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/765b0d87fcc3e839c74817b7211258cbef3a4fb9",
603   - "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9",
  599 + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/v1.2.0",
  600 + "reference": "v1.2.0",
604 601 "shasum": ""
605 602 },
606 603 "require": {
607 604 "doctrine/dbal": ">=2.2,<2.5-dev",
608   - "jdorn/sql-formatter": "~1.1",
  605 + "jdorn/sql-formatter": ">=1.1,<2.0",
609 606 "php": ">=5.3.2",
610   - "symfony/doctrine-bridge": "~2.2",
611   - "symfony/framework-bundle": "~2.2"
  607 + "symfony/doctrine-bridge": ">=2.2,<3.0",
  608 + "symfony/framework-bundle": ">=2.2,<3.0"
612 609 },
613 610 "require-dev": {
614 611 "doctrine/orm": ">=2.2,<2.5-dev",
615   - "symfony/validator": "~2.2",
616   - "symfony/yaml": "~2.2"
  612 + "symfony/validator": ">=2.2,<3.0",
  613 + "symfony/yaml": ">=2.2,<3.0"
617 614 },
618 615 "suggest": {
619 616 "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
... ... @@ -637,9 +634,7 @@
637 634 "authors": [
638 635 {
639 636 "name": "Fabien Potencier",
640   - "email": "fabien@symfony.com",
641   - "homepage": "http://fabien.potencier.org",
642   - "role": "Lead Developer"
  637 + "email": "fabien@symfony.com"
643 638 },
644 639 {
645 640 "name": "Symfony Community",
... ... @@ -751,8 +746,7 @@
751 746 {
752 747 "name": "Jonathan Wage",
753 748 "email": "jonwage@gmail.com",
754   - "homepage": "http://www.jwage.com/",
755   - "role": "Creator"
  749 + "homepage": "http://www.jwage.com/"
756 750 },
757 751 {
758 752 "name": "Guilherme Blanco",
... ... @@ -768,7 +762,7 @@
768 762 "email": "kontakt@beberlei.de"
769 763 },
770 764 {
771   - "name": "Johannes Schmitt",
  765 + "name": "Johannes M. Schmitt",
772 766 "email": "schmittjoh@gmail.com",
773 767 "homepage": "http://jmsyst.com",
774 768 "role": "Developer of wrapped JMSSerializerBundle"
... ... @@ -1269,7 +1263,7 @@
1269 1263 ],
1270 1264 "authors": [
1271 1265 {
1272   - "name": "Johannes M. Schmitt",
  1266 + "name": "Johannes Schmitt",
1273 1267 "email": "schmittjoh@gmail.com",
1274 1268 "homepage": "http://jmsyst.com",
1275 1269 "role": "Developer of wrapped JMSSerializerBundle"
... ... @@ -1287,13 +1281,13 @@
1287 1281 "version": "1.0.0",
1288 1282 "source": {
1289 1283 "type": "git",
1290   - "url": "https://github.com/schmittjoh/cg-library.git",
1291   - "reference": "ce8ef43dd6bfe6ce54e5e9844ab71be2343bf2fc"
  1284 + "url": "git://github.com/schmittjoh/cg-library.git",
  1285 + "reference": "1.0.0"
1292 1286 },
1293 1287 "dist": {
1294 1288 "type": "zip",
1295   - "url": "https://api.github.com/repos/schmittjoh/cg-library/zipball/ce8ef43dd6bfe6ce54e5e9844ab71be2343bf2fc",
1296   - "reference": "ce8ef43dd6bfe6ce54e5e9844ab71be2343bf2fc",
  1289 + "url": "https://github.com/schmittjoh/cg-library/zipball/1.0.0",
  1290 + "reference": "1.0.0",
1297 1291 "shasum": ""
1298 1292 },
1299 1293 "require": {
... ... @@ -1321,7 +1315,7 @@
1321 1315 "keywords": [
1322 1316 "code generation"
1323 1317 ],
1324   - "time": "2012-01-02 20:40:52"
  1318 + "time": "2012-01-02 12:40:52"
1325 1319 },
1326 1320 {
1327 1321 "name": "jms/di-extra-bundle",
... ... @@ -1330,20 +1324,20 @@
1330 1324 "source": {
1331 1325 "type": "git",
1332 1326 "url": "https://github.com/schmittjoh/JMSDiExtraBundle.git",
1333   - "reference": "7fffdb6c96fb922a131af06d773e1e6c5301d070"
  1327 + "reference": "1.4.0"
1334 1328 },
1335 1329 "dist": {
1336 1330 "type": "zip",
1337   - "url": "https://api.github.com/repos/schmittjoh/JMSDiExtraBundle/zipball/7fffdb6c96fb922a131af06d773e1e6c5301d070",
1338   - "reference": "7fffdb6c96fb922a131af06d773e1e6c5301d070",
  1331 + "url": "https://api.github.com/repos/schmittjoh/JMSDiExtraBundle/zipball/1.4.0",
  1332 + "reference": "1.4.0",
1339 1333 "shasum": ""
1340 1334 },
1341 1335 "require": {
1342 1336 "jms/aop-bundle": ">=1.0.0,<1.2-dev",
1343 1337 "jms/metadata": "1.*",
1344   - "symfony/finder": "~2.1",
1345   - "symfony/framework-bundle": "~2.1",
1346   - "symfony/process": "~2.1"
  1338 + "symfony/finder": ">=2.1,<3.0",
  1339 + "symfony/framework-bundle": ">=2.1,<3.0",
  1340 + "symfony/process": ">=2.1,<3.0"
1347 1341 },
1348 1342 "require-dev": {
1349 1343 "doctrine/doctrine-bundle": "*",
... ... @@ -1427,7 +1421,7 @@
1427 1421 ],
1428 1422 "authors": [
1429 1423 {
1430   - "name": "Johannes M. Schmitt",
  1424 + "name": "Johannes Schmitt",
1431 1425 "email": "schmittjoh@gmail.com",
1432 1426 "homepage": "http://jmsyst.com",
1433 1427 "role": "Developer of wrapped JMSSerializerBundle"
... ... @@ -1447,13 +1441,13 @@
1447 1441 "version": "1.0.0",
1448 1442 "source": {
1449 1443 "type": "git",
1450   - "url": "https://github.com/schmittjoh/parser-lib.git",
1451   - "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d"
  1444 + "url": "git://github.com/schmittjoh/parser-lib",
  1445 + "reference": "1.0.0"
1452 1446 },
1453 1447 "dist": {
1454 1448 "type": "zip",
1455   - "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
1456   - "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
  1449 + "url": "https://github.com/schmittjoh/parser-lib/archive/1.0.0.zip",
  1450 + "reference": "1.0.0",
1457 1451 "shasum": ""
1458 1452 },
1459 1453 "require": {
... ... @@ -1484,20 +1478,20 @@
1484 1478 "source": {
1485 1479 "type": "git",
1486 1480 "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle.git",
1487   - "reference": "f5f6c6df69ceae8b709e57b49fcc2a42d9280bcc"
  1481 + "reference": "1.5.1"
1488 1482 },
1489 1483 "dist": {
1490 1484 "type": "zip",
1491   - "url": "https://api.github.com/repos/schmittjoh/JMSSecurityExtraBundle/zipball/f5f6c6df69ceae8b709e57b49fcc2a42d9280bcc",
1492   - "reference": "f5f6c6df69ceae8b709e57b49fcc2a42d9280bcc",
  1485 + "url": "https://api.github.com/repos/schmittjoh/JMSSecurityExtraBundle/zipball/1.5.1",
  1486 + "reference": "1.5.1",
1493 1487 "shasum": ""
1494 1488 },
1495 1489 "require": {
1496   - "jms/aop-bundle": "~1.0",
1497   - "jms/di-extra-bundle": "~1.3",
1498   - "jms/metadata": "~1.0",
1499   - "jms/parser-lib": "~1.0",
1500   - "symfony/framework-bundle": "~2.1",
  1490 + "jms/aop-bundle": ">=1.0,<2.0",
  1491 + "jms/di-extra-bundle": ">=1.3,<2.0",
  1492 + "jms/metadata": ">=1.0,<2.0",
  1493 + "jms/parser-lib": ">=1.0,<2.0",
  1494 + "symfony/framework-bundle": ">=2.1,<3.0",
1501 1495 "symfony/security-bundle": "*"
1502 1496 },
1503 1497 "require-dev": {
... ... @@ -1744,7 +1738,7 @@
1744 1738 {
1745 1739 "name": "Johannes M. Schmitt",
1746 1740 "email": "schmittjoh@gmail.com",
1747   - "homepage": "https://github.com/schmittjoh",
  1741 + "homepage": "http://jmsyst.com",
1748 1742 "role": "Developer of wrapped JMSSerializerBundle"
1749 1743 }
1750 1744 ],
... ... @@ -2057,17 +2051,17 @@
2057 2051 "source": {
2058 2052 "type": "git",
2059 2053 "url": "https://github.com/kriswallsmith/assetic.git",
2060   - "reference": "a826e4b96f5c607ff47ef61caf3826b2b1e840ec"
  2054 + "reference": "v1.1.1"
2061 2055 },
2062 2056 "dist": {
2063 2057 "type": "zip",
2064   - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/a826e4b96f5c607ff47ef61caf3826b2b1e840ec",
2065   - "reference": "a826e4b96f5c607ff47ef61caf3826b2b1e840ec",
  2058 + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/v1.1.1",
  2059 + "reference": "v1.1.1",
2066 2060 "shasum": ""
2067 2061 },
2068 2062 "require": {
2069 2063 "php": ">=5.3.1",
2070   - "symfony/process": "~2.1"
  2064 + "symfony/process": ">=2.1,<3.0"
2071 2065 },
2072 2066 "require-dev": {
2073 2067 "cssmin/cssmin": "*",
... ... @@ -2077,9 +2071,9 @@
2077 2071 "leafo/scssphp": "*",
2078 2072 "leafo/scssphp-compass": "*",
2079 2073 "mrclay/minify": "*",
2080   - "phpunit/phpunit": "~3.7",
  2074 + "phpunit/phpunit": ">=3.7,<4.0",
2081 2075 "ptachoire/cssembed": "*",
2082   - "twig/twig": "~1.6"
  2076 + "twig/twig": ">=1.6,<2.0"
2083 2077 },
2084 2078 "suggest": {
2085 2079 "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
... ... @@ -2404,7 +2398,7 @@
2404 2398 ],
2405 2399 "authors": [
2406 2400 {
2407   - "name": "Johannes M. Schmitt",
  2401 + "name": "Johannes Schmitt",
2408 2402 "email": "schmittjoh@gmail.com",
2409 2403 "homepage": "http://jmsyst.com",
2410 2404 "role": "Developer of wrapped JMSSerializerBundle"
... ... @@ -2424,13 +2418,13 @@
2424 2418 "version": "1.0.0",
2425 2419 "source": {
2426 2420 "type": "git",
2427   - "url": "https://github.com/php-fig/log.git",
2428   - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
  2421 + "url": "https://github.com/php-fig/log",
  2422 + "reference": "1.0.0"
2429 2423 },
2430 2424 "dist": {
2431 2425 "type": "zip",
2432   - "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
2433   - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
  2426 + "url": "https://github.com/php-fig/log/archive/1.0.0.zip",
  2427 + "reference": "1.0.0",
2434 2428 "shasum": ""
2435 2429 },
2436 2430 "type": "library",
... ... @@ -2493,9 +2487,7 @@
2493 2487 "authors": [
2494 2488 {
2495 2489 "name": "Fabien Potencier",
2496   - "email": "fabien@symfony.com",
2497   - "homepage": "http://fabien.potencier.org",
2498   - "role": "Lead Developer"
  2490 + "email": "fabien@symfony.com"
2499 2491 }
2500 2492 ],
2501 2493 "description": "The base bundle for the Symfony Distributions",
... ... @@ -2542,9 +2534,7 @@
2542 2534 "authors": [
2543 2535 {
2544 2536 "name": "Fabien Potencier",
2545   - "email": "fabien@symfony.com",
2546   - "homepage": "http://fabien.potencier.org",
2547   - "role": "Lead Developer"
  2537 + "email": "fabien@symfony.com"
2548 2538 }
2549 2539 ],
2550 2540 "description": "This bundle provides a way to configure your controllers with annotations",
... ... @@ -2596,9 +2586,7 @@
2596 2586 "authors": [
2597 2587 {
2598 2588 "name": "Fabien Potencier",
2599   - "email": "fabien@symfony.com",
2600   - "homepage": "http://fabien.potencier.org",
2601   - "role": "Lead Developer"
  2589 + "email": "fabien@symfony.com"
2602 2590 }
2603 2591 ],
2604 2592 "description": "This bundle generates code for you",
... ... @@ -2662,27 +2650,27 @@
2662 2650 "source": {
2663 2651 "type": "git",
2664 2652 "url": "https://github.com/symfony/AsseticBundle.git",
2665   - "reference": "146dd3cb46b302bd471560471c6aaa930483dac1"
  2653 + "reference": "v2.3.0"
2666 2654 },
2667 2655 "dist": {
2668 2656 "type": "zip",
2669   - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/146dd3cb46b302bd471560471c6aaa930483dac1",
2670   - "reference": "146dd3cb46b302bd471560471c6aaa930483dac1",
  2657 + "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/v2.3.0",
  2658 + "reference": "v2.3.0",
2671 2659 "shasum": ""
2672 2660 },
2673 2661 "require": {
2674   - "kriswallsmith/assetic": "~1.1",
  2662 + "kriswallsmith/assetic": ">=1.1,<2.0",
2675 2663 "php": ">=5.3.0",
2676   - "symfony/framework-bundle": "~2.1"
  2664 + "symfony/framework-bundle": ">=2.1,<3.0"
2677 2665 },
2678 2666 "require-dev": {
2679   - "symfony/class-loader": "~2.1",
2680   - "symfony/console": "~2.1",
2681   - "symfony/css-selector": "~2.1",
2682   - "symfony/dom-crawler": "~2.1",
2683   - "symfony/form": "~2.1",
2684   - "symfony/twig-bundle": "~2.1",
2685   - "symfony/yaml": "~2.1"
  2667 + "symfony/class-loader": ">=2.1,<3.0",
  2668 + "symfony/console": ">=2.1,<3.0",
  2669 + "symfony/css-selector": ">=2.1,<3.0",
  2670 + "symfony/dom-crawler": ">=2.1,<3.0",
  2671 + "symfony/form": ">=2.1,<3.0",
  2672 + "symfony/twig-bundle": ">=2.1,<3.0",
  2673 + "symfony/yaml": ">=2.1,<3.0"
2686 2674 },
2687 2675 "suggest": {
2688 2676 "symfony/twig-bundle": "~2.1"
... ... @@ -2825,23 +2813,23 @@
2825 2813 "source": {
2826 2814 "type": "git",
2827 2815 "url": "https://github.com/symfony/MonologBundle.git",
2828   - "reference": "03ed73bc11367b3156cc21f22ac37c7f70fcd10a"
  2816 + "reference": "v2.3.0"
2829 2817 },
2830 2818 "dist": {
2831 2819 "type": "zip",
2832   - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/03ed73bc11367b3156cc21f22ac37c7f70fcd10a",
2833   - "reference": "03ed73bc11367b3156cc21f22ac37c7f70fcd10a",
  2820 + "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/v2.3.0",
  2821 + "reference": "v2.3.0",
2834 2822 "shasum": ""
2835 2823 },
2836 2824 "require": {
2837   - "monolog/monolog": "~1.3",
  2825 + "monolog/monolog": ">=1.3,<2.0",
2838 2826 "php": ">=5.3.2",
2839   - "symfony/config": "~2.2-beta2",
2840   - "symfony/dependency-injection": "~2.2-beta2",
2841   - "symfony/monolog-bridge": "~2.2-beta2"
  2827 + "symfony/config": ">=2.2-beta2,<3.0",
  2828 + "symfony/dependency-injection": ">=2.2-beta2,<3.0",
  2829 + "symfony/monolog-bridge": ">=2.2-beta2,<3.0"
2842 2830 },
2843 2831 "require-dev": {
2844   - "symfony/yaml": "~2.2-beta2"
  2832 + "symfony/yaml": ">=2.2-beta2,<3.0"
2845 2833 },
2846 2834 "type": "symfony-bundle",
2847 2835 "extra": {
... ... @@ -2861,9 +2849,7 @@
2861 2849 "authors": [
2862 2850 {
2863 2851 "name": "Fabien Potencier",
2864   - "email": "fabien@symfony.com",
2865   - "homepage": "http://fabien.potencier.org",
2866   - "role": "Lead Developer"
  2852 + "email": "fabien@symfony.com"
2867 2853 },
2868 2854 {
2869 2855 "name": "Symfony Community",
... ... @@ -3122,9 +3108,7 @@
3122 3108 "authors": [
3123 3109 {
3124 3110 "name": "Fabien Potencier",
3125   - "email": "fabien@symfony.com",
3126   - "homepage": "http://fabien.potencier.org",
3127   - "role": "Lead Developer"
  3111 + "email": "fabien@symfony.com"
3128 3112 }
3129 3113 ],
3130 3114 "description": "Common additional features for Twig that do not directly belong in core",
... ... @@ -3176,7 +3160,7 @@
3176 3160 "role": "Lead Developer"
3177 3161 },
3178 3162 {
3179   - "name": "Armin Ronacher",
  3163 + "name": "Armin Ronacher2",
3180 3164 "email": "armin.ronacher@active-4.com",
3181 3165 "role": "Project Founder"
3182 3166 },
... ...
src/Cacic/CommonBundle/Entity/ComputadorRepository.php
  Diff comments   View file @146b299
... ... @@ -221,7 +221,7 @@ class ComputadorRepository extends EntityRepository
221 221 /*
222 222 * Metodo responsável por inserir coletas iniciais, assim que o cacic é instalado
223 223 */
224   - public function getComputadorPreCole( Request $request , $te_so , $te_node_adress )
  224 + public function getComputadorPreCole( Request $request , $te_so , $te_node_adress, $rede, $so )
225 225 {
226 226 //recebe dados via POST, deCripata dados, e attribui a variaveis
227 227 $computer_system = OldCacicHelper::deCrypt( $request, $request->request->get('ComputerSystem'), true );
... ... @@ -232,10 +232,10 @@ class ComputadorRepository extends EntityRepository
232 232 $data = new \DateTime('NOW'); //armazena data Atual
233 233  
234 234 //vefifica se existe SO coletado se não, insere novo SO
235   - $so = $this->getEntityManager()->getRepository('CacicCommonBundle:So')->createIfNotExist( $te_so );
236   - $rede = $this->getEntityManager()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request );
  235 + //$so = $this->getEntityManager()->getRepository('CacicCommonBundle:So')->createIfNotExist( $te_so );
  236 + //$rede = $this->getEntityManager()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request );
237 237 $computador = $this->findOneBy( array( 'teNodeAddress'=> $te_node_adress, 'idSo'=> $so->getIdSo()) );
238   - $classes = $this->getEntityManager()->getRepository('CacicCommonBundle:Classe')->findAll();
  238 + //$classes = $this->getEntityManager()->getRepository('CacicCommonBundle:Classe')->findAll();
239 239  
240 240 //inserção de dado se for um novo computador
241 241 if( empty ( $computador ) )
... ...
src/Cacic/WSBundle/Controller/ColetaController.php
  Diff comments   View file @146b299
... ... @@ -360,7 +360,7 @@ class ColetaController extends Controller
360 360  
361 361 // Se não encontrar o valor, loga o erro e sai
362 362 if (is_null($classProperty) || $classProperty == "") {
363   - $logger->error("ERRO NA COLETA! Propriedade $classPropertyName não encontrada na requisição ou valor vazio");
  363 + $logger->debug("ERRO NA COLETA! Propriedade $classPropertyName não encontrada na requisição ou valor vazio");
364 364 return;
365 365 }
366 366  
... ...
src/Cacic/WSBundle/Controller/DefaultController.php
  Diff comments   View file @146b299
... ... @@ -74,9 +74,10 @@ class DefaultController extends Controller
74 74  
75 75 //vefifica se existe SO coletado se não, insere novo SO
76 76 $so = $this->getDoctrine()->getRepository('CacicCommonBundle:So')->createIfNotExist( $te_so );
77   - $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $te_so, $te_node_address );
78 77 $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request );
79   - $local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() ));
  78 + $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $te_so, $te_node_address, $rede, $so );
  79 + //$local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() ));
  80 + $local = $rede->getIdLocal();
80 81  
81 82 //Debugging do Agente
82 83 $debugging = ( TagValueHelper::getValueFromTags('DateToDebugging',$computador->getTeDebugging() ) == date("Ymd") ? $computador->getTeDebugging() :
... ... @@ -142,10 +143,11 @@ class DefaultController extends Controller
142 143 OldCacicHelper::autenticaAgente($request);
143 144  
144 145 $te_node_adress = TagValueHelper::getValueFromTags( 'MACAddress', OldCacicHelper::deCrypt( $request, $request->get('NetworkAdapterConfiguration')));
145   - $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $request->get( 'te_so' ),$te_node_adress );
146   - $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request );
147 146 $so = $this->getDoctrine()->getRepository('CacicCommonBundle:So')->findOneBy( array('teSo'=>$request->get( 'te_so' )));
148   - $local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() ));
  147 + $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request );
  148 + $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $request->get( 'te_so' ),$te_node_adress, $rede, $so );
  149 + //$local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() ));
  150 + $local = $rede->getIdLocal();
149 151 $data = new \DateTime('NOW');
150 152  
151 153 //Debugging do Agente
... ...
src/Cacic/WSBundle/Helper/TagValueHelper.php
  Diff comments   View file @146b299
... ... @@ -35,7 +35,7 @@ class TagValueHelper
35 35 preg_match_all("(\[" . $pStrTagLabel . "\](.+)\[\/" . $pStrTagLabel . "\])i",$pStrSource, $arrResult);
36 36  
37 37 // Garantir que o resultado contenha somente UTF-8 valido
38   - $resultado = TagValueHelper::UTF8Sanitize($arrResult[1][0]);
  38 + $resultado = TagValueHelper::UTF8Sanitize(@$arrResult[1][0]);
39 39  
40 40 return $resultado;
41 41 }
... ...