Bläddra i källkod

Add docker structure and support

ChristianCalvoLeon 5 månader sedan
förälder
incheckning
aa70423a45
100 ändrade filer med 3775 tillägg och 15 borttagningar
  1. 3 2
      .gitignore
  2. 8 5
      .vscode/launch.json
  3. 47 0
      docker-compose.yml
  4. 2 0
      etc/docker/mysql/Dockerfile
  5. 3484 0
      etc/docker/mysql/tablas/config_fecha_importaciones.sql
  6. 3 0
      etc/docker/nginx/Dockerfile
  7. 47 0
      etc/docker/nginx/default.conf
  8. 60 0
      etc/docker/php/Dockerfile
  9. 39 0
      etc/docker/php/fpm-entrypoint.sh
  10. 5 0
      etc/docker/php/xdebug-debug2.ini
  11. 6 0
      etc/docker/php/xdebug-default.ini
  12. 3 0
      etc/docker/php/xdebug-off.ini
  13. 2 0
      etc/docker/php/xdebug-profile.ini
  14. 9 0
      etc/docker/php/xdebug.ini
  15. 48 0
      html/.vscode/launch.json
  16. 0 0
      html/application/.htaccess
  17. 0 0
      html/application/cache/index.html
  18. 0 0
      html/application/config/autoload.php
  19. 0 0
      html/application/config/config.php
  20. 0 0
      html/application/config/constants.php
  21. 2 2
      html/application/config/database.php
  22. 0 0
      html/application/config/doctypes.php
  23. 0 0
      html/application/config/foreign_chars.php
  24. 0 0
      html/application/config/hooks.php
  25. 0 0
      html/application/config/index.html
  26. 0 0
      html/application/config/memcached.php
  27. 0 0
      html/application/config/migration.php
  28. 0 0
      html/application/config/mimes.php
  29. 0 0
      html/application/config/profiler.php
  30. 0 0
      html/application/config/routes.php
  31. 0 0
      html/application/config/smileys.php
  32. 0 0
      html/application/config/user_agents.php
  33. 5 4
      html/application/controllers/Parser.php
  34. 2 2
      html/application/controllers/ParserCompleto.php
  35. 0 0
      html/application/core/MY_DB_mysqli_driver.php
  36. 0 0
      html/application/core/MY_Loader.php
  37. 0 0
      html/application/core/README.md
  38. 0 0
      html/application/core/index.html
  39. 0 0
      html/application/helpers/email_templates_helper.php
  40. 0 0
      html/application/helpers/funciones_helper.php
  41. 0 0
      html/application/helpers/index.html
  42. 0 0
      html/application/hooks/index.html
  43. 0 0
      html/application/index.html
  44. 0 0
      html/application/language/english/index.html
  45. 0 0
      html/application/language/index.html
  46. 0 0
      html/application/libraries/Excel.php
  47. 0 0
      html/application/libraries/ExportXls.php
  48. 0 0
      html/application/libraries/PHPExcel.php
  49. 0 0
      html/application/libraries/PHPExcel/Autoloader.php
  50. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorage/APC.php
  51. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorage/CacheBase.php
  52. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorage/DiscISAM.php
  53. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorage/ICache.php
  54. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorage/Igbinary.php
  55. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorage/Memcache.php
  56. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorage/Memory.php
  57. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorage/MemoryGZip.php
  58. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorage/MemorySerialized.php
  59. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorage/PHPTemp.php
  60. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorage/SQLite.php
  61. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorage/SQLite3.php
  62. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorage/Wincache.php
  63. 0 0
      html/application/libraries/PHPExcel/CachedObjectStorageFactory.php
  64. 0 0
      html/application/libraries/PHPExcel/CalcEngine/CyclicReferenceStack.php
  65. 0 0
      html/application/libraries/PHPExcel/CalcEngine/Logger.php
  66. 0 0
      html/application/libraries/PHPExcel/Calculation.php
  67. 0 0
      html/application/libraries/PHPExcel/Calculation/Database.php
  68. 0 0
      html/application/libraries/PHPExcel/Calculation/DateTime.php
  69. 0 0
      html/application/libraries/PHPExcel/Calculation/Engineering.php
  70. 0 0
      html/application/libraries/PHPExcel/Calculation/Exception.php
  71. 0 0
      html/application/libraries/PHPExcel/Calculation/ExceptionHandler.php
  72. 0 0
      html/application/libraries/PHPExcel/Calculation/Financial.php
  73. 0 0
      html/application/libraries/PHPExcel/Calculation/FormulaParser.php
  74. 0 0
      html/application/libraries/PHPExcel/Calculation/FormulaToken.php
  75. 0 0
      html/application/libraries/PHPExcel/Calculation/Function.php
  76. 0 0
      html/application/libraries/PHPExcel/Calculation/Functions.php
  77. 0 0
      html/application/libraries/PHPExcel/Calculation/Logical.php
  78. 0 0
      html/application/libraries/PHPExcel/Calculation/LookupRef.php
  79. 0 0
      html/application/libraries/PHPExcel/Calculation/MathTrig.php
  80. 0 0
      html/application/libraries/PHPExcel/Calculation/Statistical.php
  81. 0 0
      html/application/libraries/PHPExcel/Calculation/TextData.php
  82. 0 0
      html/application/libraries/PHPExcel/Calculation/Token/Stack.php
  83. 0 0
      html/application/libraries/PHPExcel/Calculation/functionlist.txt
  84. 0 0
      html/application/libraries/PHPExcel/Cell.php
  85. 0 0
      html/application/libraries/PHPExcel/Cell/AdvancedValueBinder.php
  86. 0 0
      html/application/libraries/PHPExcel/Cell/DataType.php
  87. 0 0
      html/application/libraries/PHPExcel/Cell/DataValidation.php
  88. 0 0
      html/application/libraries/PHPExcel/Cell/DefaultValueBinder.php
  89. 0 0
      html/application/libraries/PHPExcel/Cell/Hyperlink.php
  90. 0 0
      html/application/libraries/PHPExcel/Cell/IValueBinder.php
  91. 0 0
      html/application/libraries/PHPExcel/Chart.php
  92. 0 0
      html/application/libraries/PHPExcel/Chart/Axis.php
  93. 0 0
      html/application/libraries/PHPExcel/Chart/DataSeries.php
  94. 0 0
      html/application/libraries/PHPExcel/Chart/DataSeriesValues.php
  95. 0 0
      html/application/libraries/PHPExcel/Chart/Exception.php
  96. 0 0
      html/application/libraries/PHPExcel/Chart/GridLines.php
  97. 0 0
      html/application/libraries/PHPExcel/Chart/Layout.php
  98. 0 0
      html/application/libraries/PHPExcel/Chart/Legend.php
  99. 0 0
      html/application/libraries/PHPExcel/Chart/PlotArea.php
  100. 0 0
      html/application/libraries/PHPExcel/Chart/Properties.php

+ 3 - 2
.gitignore Visa fil

@@ -29,10 +29,10 @@ user_guide_src/cilexer/pycilexer.egg-info/*
29 29
 *.sublime-project
30 30
 /tests/tests/
31 31
 /tests/results/
32
-DOWNLOADS/
32
+#DOWNLOADS/
33 33
 open-placsp-1.1.1
34 34
 Beyond Compare 4
35
-uploads/
35
+#uploads/
36 36
 application/config/database.php
37 37
 application/libraries/ParserDatabaseBruto1.php
38 38
 .vscode/launch.json123
@@ -41,3 +41,4 @@ liciagbar.sql
41 41
 tablas_configuraciones.sql
42 42
 vendor.zip
43 43
 application/application.zip
44
+mysql

+ 8 - 5
.vscode/launch.json Visa fil

@@ -1,14 +1,17 @@
1 1
 {
2
-    // Use IntelliSense para saber los atributos posibles.
3
-    // Mantenga el puntero para ver las descripciones de los existentes atributos.
4
-    // Para más información, visite: https://go.microsoft.com/fwlink/?linkid=830387
2
+    // Use IntelliSense to learn about possible attributes.
3
+    // Hover to view descriptions of existing attributes.
4
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5 5
     "version": "0.2.0",
6 6
     "configurations": [
7 7
         {
8 8
             "name": "Listen for Xdebug",
9 9
             "type": "php",
10 10
             "request": "launch",
11
-            "port": 9003
11
+            "port": 9001,
12
+            "pathMappings": {
13
+                "/var/www/html": "${workspaceFolder}\\html"
14
+            },
12 15
         },
13 16
         {
14 17
             "name": "Launch currently open script",
@@ -37,7 +40,7 @@
37 40
             ],
38 41
             "program": "",
39 42
             "cwd": "${workspaceRoot}",
40
-            "port": 9003,
43
+            "port": 9001,
41 44
             "serverReadyAction": {
42 45
                 "pattern": "Development Server \\(http://localhost:([0-9]+)\\) started",
43 46
                 "uriFormat": "http://localhost:%s",

+ 47 - 0
docker-compose.yml Visa fil

@@ -0,0 +1,47 @@
1
+version: "3.7"
2
+
3
+services:
4
+    nginx:
5
+        build:
6
+            context: './etc/docker/nginx'
7
+        ports:
8
+            - "8080:80"
9
+        networks:
10
+            - internal
11
+        #volumes:
12
+        #    - ./html:/var/www/html
13
+
14
+    php:
15
+        build:
16
+            context: ./ # Contexto es la raíz del proyecto
17
+            dockerfile: ./etc/docker/php/Dockerfile # Ruta relativa del Dockerfile
18
+        container_name: 'liciagbar_web'
19
+        networks:
20
+            - internal
21
+        links:
22
+            - db_liciagbar_alpine
23
+        #volumes:
24
+        #    - .:/var/www
25
+        extra_hosts:
26
+            - "host.docker.internal:host-gateway"
27
+
28
+    db_liciagbar_alpine:
29
+        build:
30
+            context: './etc/docker/mysql'
31
+        command: '--sql_mode=""'
32
+        volumes:
33
+            # Copiamos el script SQL al directorio de inicialización de MySQL
34
+            - ./etc/docker/mysql/tablas/config_fecha_importaciones.sql:/docker-entrypoint-initdb.d/config_fecha_importaciones.sql
35
+            # Directorio de datos de MySQL
36
+            - ./mysql/data:/var/lib/mysql
37
+        environment:
38
+            - MYSQL_DATABASE=liciagbar
39
+            - MYSQL_ROOT_PASSWORD=liciagbar
40
+        ports:
41
+            - "3306:3306"
42
+        networks:
43
+            - internal
44
+
45
+networks:
46
+    internal:
47
+        driver: bridge

+ 2 - 0
etc/docker/mysql/Dockerfile Visa fil

@@ -0,0 +1,2 @@
1
+#FROM postgres:15.1-alpine3.17
2
+FROM mysql:5.7

Filskillnaden har hållits tillbaka eftersom den är för stor
+ 3484 - 0
etc/docker/mysql/tablas/config_fecha_importaciones.sql


+ 3 - 0
etc/docker/nginx/Dockerfile Visa fil

@@ -0,0 +1,3 @@
1
+FROM nginx:alpine
2
+ADD ./default.conf /etc/nginx/conf.d
3
+EXPOSE 465

+ 47 - 0
etc/docker/nginx/default.conf Visa fil

@@ -0,0 +1,47 @@
1
+server {
2
+    listen 0.0.0.0:80;
3
+    root /var/www/html;
4
+    server_name localhost;
5
+
6
+    location / {
7
+        index index.php index.html;
8
+        try_files $uri $uri/ /index.php;
9
+    }
10
+
11
+    location ~ \.php$ {
12
+        fastcgi_split_path_info ^(.+\.php)(.*)$;
13
+        fastcgi_pass php:9000;
14
+        include /etc/nginx/fastcgi_params;        
15
+        fastcgi_index index.php;
16
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
17
+        fastcgi_param PATH_INFO  $fastcgi_path_info;
18
+        
19
+        # Ajustes para tiempos de espera largos
20
+        fastcgi_read_timeout 1000;   # Aumentar tiempo de espera para lectura
21
+        fastcgi_send_timeout 1000;   # Aumentar tiempo de espera para enviar datos
22
+        proxy_read_timeout 1000;     # Aumentar tiempo de espera para proxy
23
+        proxy_connect_timeout 1000;  # Aumentar tiempo de conexión
24
+    }
25
+
26
+    location ^~ /css {
27
+        add_header  Content-Type    text/css;
28
+        fastcgi_param PATH_INFO $fastcgi_path_info;
29
+        fastcgi_pass php:9000;
30
+        fastcgi_index index.php;
31
+        include fastcgi_params;
32
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
33
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
34
+        fastcgi_hide_header X-Powered-By;
35
+    }
36
+
37
+    location ^~ /js {
38
+        add_header  Content-Type    application/javascript;
39
+        fastcgi_param PATH_INFO $fastcgi_path_info;
40
+        fastcgi_pass php:9000;
41
+        fastcgi_index index.php;
42
+        include fastcgi_params;
43
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
44
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
45
+        fastcgi_hide_header X-Powered-By;
46
+    }
47
+}

+ 60 - 0
etc/docker/php/Dockerfile Visa fil

@@ -0,0 +1,60 @@
1
+FROM php:7.4.33-fpm-alpine3.15
2
+RUN apk update
3
+RUN docker-php-ext-install opcache
4
+RUN docker-php-ext-install mysqli
5
+RUN docker-php-ext-install pdo pdo_mysql
6
+
7
+RUN apk add --no-cache libzip-dev && \
8
+    docker-php-ext-install zip
9
+
10
+# xdebug with VSCODE
11
+ENV XDEBUG_VERSION=2.9.2
12
+RUN apk --no-cache add --virtual .build-deps \
13
+    g++ \
14
+    autoconf \
15
+    make && \
16
+    pecl install xdebug-${XDEBUG_VERSION} && \
17
+    docker-php-ext-enable xdebug && \
18
+    apk del .build-deps && \
19
+    rm -r /tmp/pear/* && \
20
+    echo -e "xdebug.remote_enable=1\n\
21
+    xdebug.remote_autostart=1\n\
22
+    xdebug.remote_connect_back=0\n\
23
+    xdebug.remote_port=9001\n\
24
+    xdebug.idekey=\"VSCODE\"\n\
25
+    xdebug.remote_host=host.docker.internal" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
26
+# Instalar herramientas básicas como chmod
27
+RUN apk add --no-cache coreutils
28
+#COPY ../../../files/ /var/www
29
+# Opcional: Crear carpetas con permisos específicos
30
+RUN mkdir -p /var/www/html/DOWNLOADS && \
31
+    mkdir -p /var/www/html/DOWNLOADS/DAILY && \
32
+    mkdir -p /var/www/html/DOWNLOADS/MONTH && \
33
+    ls -l /var/www/html/DOWNLOADS && \
34
+    chmod 755 /var/www/html/DOWNLOADS/DAILY && \
35
+    chmod 755 /var/www/html/DOWNLOADS/MONTH
36
+
37
+# Configurar PHP para permitir ejecución prolongada
38
+RUN echo "max_execution_time = 0" >> /usr/local/etc/php/conf.d/99-custom.ini
39
+RUN echo "max_input_time = 0" >> /usr/local/etc/php/conf.d/99-custom.ini
40
+RUN echo "memory_limit = 3G" >> /usr/local/etc/php/conf.d/99-custom.ini
41
+RUN echo "post_max_size = 2G" >> /usr/local/etc/php/conf.d/99-custom.ini
42
+RUN echo "upload_max_filesize = 1G" >> /usr/local/etc/php/conf.d/99-custom.ini
43
+
44
+EXPOSE 9000
45
+
46
+# 5. composer
47
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
48
+
49
+
50
+# Copiar todo el contenido desde la raíz del contexto al contenedor
51
+COPY ./html /var/www/html
52
+
53
+# Cambiar permisos de la carpeta de logs y otras necesarias
54
+RUN chown -R www-data:www-data /var/www/html/application/logs && \
55
+    chmod -R 775 /var/www/html/application/logs
56
+
57
+
58
+WORKDIR /var/www/html
59
+
60
+

+ 39 - 0
etc/docker/php/fpm-entrypoint.sh Visa fil

@@ -0,0 +1,39 @@
1
+#!/usr/bin/env bash
2
+set -e
3
+
4
+echo "Copying default XDEBUG ini"
5
+cp /home/xdebug/xdebug-default.ini /usr/local/etc/php/conf.d/xdebug.ini
6
+
7
+if [[ $MODES == *"profile"* ]]; then
8
+    echo "Appending profile ini"
9
+    cat /home/xdebug/xdebug-profile.ini >> /usr/local/etc/php/conf.d/xdebug.ini
10
+fi
11
+
12
+if [[ $MODES == *"debug"* ]]; then
13
+    echo "Appending debug ini"
14
+    cat /home/xdebug/xdebug-debug.ini >> /usr/local/etc/php/conf.d/xdebug.ini
15
+
16
+    echo "Setting Client Host to: $CLIENT_HOST"
17
+    sed -i -e 's/xdebug.client_host = localhost/xdebug.client_host = '"${CLIENT_HOST}"'/g' /usr/local/etc/php/conf.d/xdebug.ini
18
+
19
+    echo "Setting Client Port to: $CLIENT_PORT"
20
+    sed -i -e 's/xdebug.client_port = 9003/xdebug.client_port = '"${CLIENT_PORT}"'/g' /usr/local/etc/php/conf.d/xdebug.ini
21
+
22
+    echo "Setting IDE Key to: $IDEKEY"
23
+    sed -i -e 's/xdebug.idekey = docker/xdebug.idekey = '"${IDEKEY}"'/g' /usr/local/etc/php/conf.d/xdebug.ini
24
+fi
25
+
26
+if [[ $MODES == *"trace"* ]]; then
27
+    echo "Appending trace ini"
28
+    cat /home/xdebug/xdebug-trace.ini >> /usr/local/etc/php/conf.d/xdebug.ini
29
+fi
30
+
31
+if [[ "off" == $MODES || -z $MODES ]]; then
32
+    echo "Disabling XDEBUG";
33
+    cp /home/xdebug/xdebug-off.ini /usr/local/etc/php/conf.d/xdebug.ini
34
+else
35
+    echo "Setting XDEBUG mode: $MODES"
36
+    echo "xdebug.mode = $MODES" >> /usr/local/etc/php/conf.d/xdebug.ini
37
+fi;
38
+
39
+php

+ 5 - 0
etc/docker/php/xdebug-debug2.ini Visa fil

@@ -0,0 +1,5 @@
1
+; Remote debugging
2
+xdebug.client_host = localhost
3
+xdebug.client_port = 9003
4
+xdebug.discover_client_host = false
5
+xdebug.idekey = docker

+ 6 - 0
etc/docker/php/xdebug-default.ini Visa fil

@@ -0,0 +1,6 @@
1
+[xdebug]
2
+zend_extension = xdebug.so
3
+xdebug.cli_color = 1
4
+xdebug.start_with_request = yes
5
+xdebug.output_dir = "/tmp/xdebug"
6
+xdebug.log = "/tmp/xdebug/xdebug-log.log"

+ 3 - 0
etc/docker/php/xdebug-off.ini Visa fil

@@ -0,0 +1,3 @@
1
+[xdebug]
2
+zend_extension = xdebug.so
3
+xdebug.mode = off

+ 2 - 0
etc/docker/php/xdebug-profile.ini Visa fil

@@ -0,0 +1,2 @@
1
+; Profiler
2
+xdebug.profiler_output_name = cachegrind.out.%c-%t

+ 9 - 0
etc/docker/php/xdebug.ini Visa fil

@@ -0,0 +1,9 @@
1
+# docker/php/xdebug.ini
2
+zend_extension=xdebug
3
+
4
+[xdebug]
5
+xdebug.mode=develop,debug
6
+xdebug.client_host=host.docker.internal
7
+xdebug.client_port = 9003
8
+xdebug.start_with_request=yes
9
+xdebug.connect_timeout_ms=2000

+ 48 - 0
html/.vscode/launch.json Visa fil

@@ -0,0 +1,48 @@
1
+{
2
+    // Use IntelliSense para saber los atributos posibles.
3
+    // Mantenga el puntero para ver las descripciones de los existentes atributos.
4
+    // Para más información, visite: https://go.microsoft.com/fwlink/?linkid=830387
5
+    "version": "0.2.0",
6
+    "configurations": [
7
+        {
8
+            "name": "Listen for Xdebug",
9
+            "type": "php",
10
+            "request": "launch",
11
+            "port": 9003
12
+        },
13
+        {
14
+            "name": "Launch currently open script",
15
+            "type": "php",
16
+            "request": "launch",
17
+            "program": "${file}",
18
+            "cwd": "${fileDirname}",
19
+            "port": 0,
20
+            "runtimeArgs": [
21
+                "-dxdebug.start_with_request=yes"
22
+            ],
23
+            "env": {
24
+                "XDEBUG_MODE": "debug,develop",
25
+                "XDEBUG_CONFIG": "client_port=${port}"
26
+            }
27
+        },
28
+        {
29
+            "name": "Launch Built-in web server",
30
+            "type": "php",
31
+            "request": "launch",
32
+            "runtimeArgs": [
33
+                "-dxdebug.mode=debug",
34
+                "-dxdebug.start_with_request=yes",
35
+                "-S",
36
+                "localhost:0"
37
+            ],
38
+            "program": "",
39
+            "cwd": "${workspaceRoot}",
40
+            "port": 9003,
41
+            "serverReadyAction": {
42
+                "pattern": "Development Server \\(http://localhost:([0-9]+)\\) started",
43
+                "uriFormat": "http://localhost:%s",
44
+                "action": "openExternally"
45
+            }
46
+        }
47
+    ]
48
+}

application/.htaccess → html/application/.htaccess Visa fil


application/cache/index.html → html/application/cache/index.html Visa fil


application/config/autoload.php → html/application/config/autoload.php Visa fil


application/config/config.php → html/application/config/config.php Visa fil


application/config/constants.php → html/application/config/constants.php Visa fil


application/config/database.php → html/application/config/database.php Visa fil

@@ -76,12 +76,12 @@ $query_builder = true;
76 76
 $db['default'] = array(
77 77
     'dsn' => '',
78 78
     //'hostname' => 'office.mindden.com',
79
-    'hostname' => "localhost",
79
+    'hostname' => "db_liciagbar_alpine",
80 80
     //'port' => '33306',
81 81
     'port' => '3306',
82 82
     'username' => 'root',
83 83
     //'password' => 'mindden2017',
84
-    'password' => '',
84
+    'password' => 'liciagbar',
85 85
     'database' => 'liciagbar',
86 86
     'dbdriver' => 'mysqli',
87 87
     'dbprefix' => '',

application/config/doctypes.php → html/application/config/doctypes.php Visa fil


application/config/foreign_chars.php → html/application/config/foreign_chars.php Visa fil


application/config/hooks.php → html/application/config/hooks.php Visa fil


application/config/index.html → html/application/config/index.html Visa fil


application/config/memcached.php → html/application/config/memcached.php Visa fil


application/config/migration.php → html/application/config/migration.php Visa fil


application/config/mimes.php → html/application/config/mimes.php Visa fil


application/config/profiler.php → html/application/config/profiler.php Visa fil


application/config/routes.php → html/application/config/routes.php Visa fil


application/config/smileys.php → html/application/config/smileys.php Visa fil


application/config/user_agents.php → html/application/config/user_agents.php Visa fil


application/controllers/Parser.php → html/application/controllers/Parser.php Visa fil

@@ -25,7 +25,7 @@ class Parser extends CI_Controller
25 25
     public function index()
26 26
     {
27 27
 
28
-        $fechaCarpeta = "";
28
+        /*$fechaCarpeta = "";
29 29
 
30 30
         $this->Parser_model->inicioParser();
31 31
 
@@ -54,10 +54,11 @@ class Parser extends CI_Controller
54 54
 
55 55
             $this->parserfile->index($this->rutaDiariaFecha, $fechaCarpeta, $row, $idUltimaImportacion);
56 56
         }
57
-
57
+*/
58
+        $idUltimaImportacion = 81;
58 59
         $this->tablasCalculadas($idUltimaImportacion);
59 60
 
60
-        $this->load->library('exportXls');
61
+        $this->load->library('ExportXls');
61 62
 
62 63
         $this->exportxls->exportDatosCompletos();
63 64
 
@@ -169,7 +170,7 @@ class Parser extends CI_Controller
169 170
 
170 171
         $licitaciones = $this->Xlsexport_model->getLicitaciones($idUltimaImportacion);
171 172
 
172
-        insertBucleDuplicateOnKey($licitaciones['datos'], "vista_datos_licitacion", "");
173
+        insertBucleDuplicateOnKey($licitaciones['datos'], "vista_datos_licitacion", "insertVistaDatosLicitacionesPreExcel");
173 174
     }
174 175
 
175 176
     private function removeFoldersFromThursdayToMonday($ruta)

application/controllers/ParserCompleto.php → html/application/controllers/ParserCompleto.php Visa fil

@@ -20,10 +20,10 @@ defined('BASEPATH') or exit('No direct script access allowed');
20 20
 class Parsercompleto extends CI_Controller
21 21
 {
22 22
 
23
-    protected $rutaDiaria = FCPATH . "DOWNLOADS/DAILY/";
23
+    protected $rutaDiaria = FCPATH . "DOWNLOADS/DAILY";
24 24
     protected $rutaDiariaFecha = "";
25 25
 
26
-    protected $rutaMensual = FCPATH . "DOWNLOADS/MONTH/";
26
+    protected $rutaMensual = FCPATH . "DOWNLOADS/MONTH";
27 27
     protected $enlaceAtom = "";
28 28
     protected $fechaCreacionLog = "";
29 29
 

application/core/MY_DB_mysqli_driver.php → html/application/core/MY_DB_mysqli_driver.php Visa fil


application/core/MY_Loader.php → html/application/core/MY_Loader.php Visa fil


application/core/README.md → html/application/core/README.md Visa fil


application/core/index.html → html/application/core/index.html Visa fil


application/helpers/email_templates_helper.php → html/application/helpers/email_templates_helper.php Visa fil


application/helpers/funciones_helper.php → html/application/helpers/funciones_helper.php Visa fil


application/helpers/index.html → html/application/helpers/index.html Visa fil


application/hooks/index.html → html/application/hooks/index.html Visa fil


application/index.html → html/application/index.html Visa fil


application/language/english/index.html → html/application/language/english/index.html Visa fil


application/language/index.html → html/application/language/index.html Visa fil


application/libraries/Excel.php → html/application/libraries/Excel.php Visa fil


application/libraries/ExportXls.php → html/application/libraries/ExportXls.php Visa fil


application/libraries/PHPExcel.php → html/application/libraries/PHPExcel.php Visa fil


application/libraries/PHPExcel/Autoloader.php → html/application/libraries/PHPExcel/Autoloader.php Visa fil


application/libraries/PHPExcel/CachedObjectStorage/APC.php → html/application/libraries/PHPExcel/CachedObjectStorage/APC.php Visa fil


application/libraries/PHPExcel/CachedObjectStorage/CacheBase.php → html/application/libraries/PHPExcel/CachedObjectStorage/CacheBase.php Visa fil


application/libraries/PHPExcel/CachedObjectStorage/DiscISAM.php → html/application/libraries/PHPExcel/CachedObjectStorage/DiscISAM.php Visa fil


application/libraries/PHPExcel/CachedObjectStorage/ICache.php → html/application/libraries/PHPExcel/CachedObjectStorage/ICache.php Visa fil


application/libraries/PHPExcel/CachedObjectStorage/Igbinary.php → html/application/libraries/PHPExcel/CachedObjectStorage/Igbinary.php Visa fil


application/libraries/PHPExcel/CachedObjectStorage/Memcache.php → html/application/libraries/PHPExcel/CachedObjectStorage/Memcache.php Visa fil


application/libraries/PHPExcel/CachedObjectStorage/Memory.php → html/application/libraries/PHPExcel/CachedObjectStorage/Memory.php Visa fil


application/libraries/PHPExcel/CachedObjectStorage/MemoryGZip.php → html/application/libraries/PHPExcel/CachedObjectStorage/MemoryGZip.php Visa fil


application/libraries/PHPExcel/CachedObjectStorage/MemorySerialized.php → html/application/libraries/PHPExcel/CachedObjectStorage/MemorySerialized.php Visa fil


application/libraries/PHPExcel/CachedObjectStorage/PHPTemp.php → html/application/libraries/PHPExcel/CachedObjectStorage/PHPTemp.php Visa fil


application/libraries/PHPExcel/CachedObjectStorage/SQLite.php → html/application/libraries/PHPExcel/CachedObjectStorage/SQLite.php Visa fil


application/libraries/PHPExcel/CachedObjectStorage/SQLite3.php → html/application/libraries/PHPExcel/CachedObjectStorage/SQLite3.php Visa fil


application/libraries/PHPExcel/CachedObjectStorage/Wincache.php → html/application/libraries/PHPExcel/CachedObjectStorage/Wincache.php Visa fil


application/libraries/PHPExcel/CachedObjectStorageFactory.php → html/application/libraries/PHPExcel/CachedObjectStorageFactory.php Visa fil


application/libraries/PHPExcel/CalcEngine/CyclicReferenceStack.php → html/application/libraries/PHPExcel/CalcEngine/CyclicReferenceStack.php Visa fil


application/libraries/PHPExcel/CalcEngine/Logger.php → html/application/libraries/PHPExcel/CalcEngine/Logger.php Visa fil


application/libraries/PHPExcel/Calculation.php → html/application/libraries/PHPExcel/Calculation.php Visa fil


application/libraries/PHPExcel/Calculation/Database.php → html/application/libraries/PHPExcel/Calculation/Database.php Visa fil


application/libraries/PHPExcel/Calculation/DateTime.php → html/application/libraries/PHPExcel/Calculation/DateTime.php Visa fil


application/libraries/PHPExcel/Calculation/Engineering.php → html/application/libraries/PHPExcel/Calculation/Engineering.php Visa fil


application/libraries/PHPExcel/Calculation/Exception.php → html/application/libraries/PHPExcel/Calculation/Exception.php Visa fil


application/libraries/PHPExcel/Calculation/ExceptionHandler.php → html/application/libraries/PHPExcel/Calculation/ExceptionHandler.php Visa fil


application/libraries/PHPExcel/Calculation/Financial.php → html/application/libraries/PHPExcel/Calculation/Financial.php Visa fil


application/libraries/PHPExcel/Calculation/FormulaParser.php → html/application/libraries/PHPExcel/Calculation/FormulaParser.php Visa fil


application/libraries/PHPExcel/Calculation/FormulaToken.php → html/application/libraries/PHPExcel/Calculation/FormulaToken.php Visa fil


application/libraries/PHPExcel/Calculation/Function.php → html/application/libraries/PHPExcel/Calculation/Function.php Visa fil


application/libraries/PHPExcel/Calculation/Functions.php → html/application/libraries/PHPExcel/Calculation/Functions.php Visa fil


application/libraries/PHPExcel/Calculation/Logical.php → html/application/libraries/PHPExcel/Calculation/Logical.php Visa fil


application/libraries/PHPExcel/Calculation/LookupRef.php → html/application/libraries/PHPExcel/Calculation/LookupRef.php Visa fil


application/libraries/PHPExcel/Calculation/MathTrig.php → html/application/libraries/PHPExcel/Calculation/MathTrig.php Visa fil


application/libraries/PHPExcel/Calculation/Statistical.php → html/application/libraries/PHPExcel/Calculation/Statistical.php Visa fil


application/libraries/PHPExcel/Calculation/TextData.php → html/application/libraries/PHPExcel/Calculation/TextData.php Visa fil


application/libraries/PHPExcel/Calculation/Token/Stack.php → html/application/libraries/PHPExcel/Calculation/Token/Stack.php Visa fil


application/libraries/PHPExcel/Calculation/functionlist.txt → html/application/libraries/PHPExcel/Calculation/functionlist.txt Visa fil


application/libraries/PHPExcel/Cell.php → html/application/libraries/PHPExcel/Cell.php Visa fil


application/libraries/PHPExcel/Cell/AdvancedValueBinder.php → html/application/libraries/PHPExcel/Cell/AdvancedValueBinder.php Visa fil


application/libraries/PHPExcel/Cell/DataType.php → html/application/libraries/PHPExcel/Cell/DataType.php Visa fil


application/libraries/PHPExcel/Cell/DataValidation.php → html/application/libraries/PHPExcel/Cell/DataValidation.php Visa fil


application/libraries/PHPExcel/Cell/DefaultValueBinder.php → html/application/libraries/PHPExcel/Cell/DefaultValueBinder.php Visa fil


application/libraries/PHPExcel/Cell/Hyperlink.php → html/application/libraries/PHPExcel/Cell/Hyperlink.php Visa fil


application/libraries/PHPExcel/Cell/IValueBinder.php → html/application/libraries/PHPExcel/Cell/IValueBinder.php Visa fil


application/libraries/PHPExcel/Chart.php → html/application/libraries/PHPExcel/Chart.php Visa fil


application/libraries/PHPExcel/Chart/Axis.php → html/application/libraries/PHPExcel/Chart/Axis.php Visa fil


application/libraries/PHPExcel/Chart/DataSeries.php → html/application/libraries/PHPExcel/Chart/DataSeries.php Visa fil


application/libraries/PHPExcel/Chart/DataSeriesValues.php → html/application/libraries/PHPExcel/Chart/DataSeriesValues.php Visa fil


application/libraries/PHPExcel/Chart/Exception.php → html/application/libraries/PHPExcel/Chart/Exception.php Visa fil


application/libraries/PHPExcel/Chart/GridLines.php → html/application/libraries/PHPExcel/Chart/GridLines.php Visa fil


application/libraries/PHPExcel/Chart/Layout.php → html/application/libraries/PHPExcel/Chart/Layout.php Visa fil


application/libraries/PHPExcel/Chart/Legend.php → html/application/libraries/PHPExcel/Chart/Legend.php Visa fil


application/libraries/PHPExcel/Chart/PlotArea.php → html/application/libraries/PHPExcel/Chart/PlotArea.php Visa fil


application/libraries/PHPExcel/Chart/Properties.php → html/application/libraries/PHPExcel/Chart/Properties.php Visa fil


Vissa filer visades inte eftersom för många filer har ändrats