From 1647f53cef34dc58f347dd12c2f10d206f6a9ae5 Mon Sep 17 00:00:00 2001
From: Gabriel Fuentes <blender.1379@gmail.com>
Date: Mon, 22 Apr 2019 20:32:17 -0500
Subject: [PATCH] carga con anio y busqueda por autor tambien ok

---
 .idea/workspace.xml    | 71 ++++++++++++++++++++++++++----------------
 componentes/header.php |  2 +-
 pagina/libro.php       |  2 +-
 3 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index afe8bd8..183a6e2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="6b925d8f-3741-4302-aa30-691568703891" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/componentes/header.php" beforeDir="false" afterPath="$PROJECT_DIR$/componentes/header.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pagina/libro.php" beforeDir="false" afterPath="$PROJECT_DIR$/pagina/libro.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -34,11 +35,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/componentes/header.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="355">
-              <caret line="93" column="62" selection-start-line="93" selection-start-column="62" selection-end-line="93" selection-end-column="62" />
+              <caret line="93" column="59" selection-start-line="93" selection-start-column="59" selection-end-line="93" selection-end-column="59" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/funciones/libro.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="134">
+              <caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
             </state>
           </provider>
         </entry>
@@ -79,12 +89,13 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pagina/libro.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="113">
-              <caret line="75" column="32" selection-start-line="75" selection-start-column="32" selection-end-line="86" selection-end-column="38" />
+            <state relative-caret-position="377">
+              <caret line="111" column="94" selection-start-line="111" selection-start-column="94" selection-end-line="111" selection-end-column="94" />
               <folding>
+                <element signature="n#style#0;n#input#0;n#form#0;n#nav#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#ul#0;n#div#0;n#!!top" expanded="true" />
               </folding>
@@ -193,13 +204,13 @@
         <option value="$PROJECT_DIR$/pagina/lineamiento.html" />
         <option value="$PROJECT_DIR$/componentes/footer.php" />
         <option value="$PROJECT_DIR$/pagina/categoria.php" />
-        <option value="$PROJECT_DIR$/pagina/libro.php" />
         <option value="$PROJECT_DIR$/pagina/resultado.php" />
         <option value="$PROJECT_DIR$/pagina/sinresultado.php" />
         <option value="$PROJECT_DIR$/sql/base.sql" />
         <option value="$PROJECT_DIR$/funciones/carga.php" />
         <option value="$PROJECT_DIR$/sql/conexion.php" />
         <option value="$PROJECT_DIR$/componentes/header.php" />
+        <option value="$PROJECT_DIR$/pagina/libro.php" />
       </list>
     </option>
   </component>
@@ -246,6 +257,11 @@
               <item name="portal_editorial" type="462c0819:PsiDirectoryNode" />
               <item name="img" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="portal_editorial" type="b2602c69:ProjectViewProjectNode" />
+              <item name="portal_editorial" type="462c0819:PsiDirectoryNode" />
+              <item name="pagina" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="portal_editorial" type="b2602c69:ProjectViewProjectNode" />
               <item name="portal_editorial" type="462c0819:PsiDirectoryNode" />
@@ -347,12 +363,12 @@
       <workItem from="1554848398409" duration="1249000" />
       <workItem from="1554934333535" duration="634000" />
       <workItem from="1555466329394" duration="1765000" />
-      <workItem from="1555973146343" duration="5383000" />
+      <workItem from="1555973146343" duration="5543000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="305396000" />
+    <option name="totallyTimeSpent" value="305556000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -554,13 +570,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/funciones/libro.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="134">
-          <caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pagina/categoria.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="289">
@@ -568,17 +577,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pagina/libro.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="113">
-          <caret line="75" column="32" selection-start-line="75" selection-start-column="32" selection-end-line="86" selection-end-column="38" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#ul#0;n#div#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pagina/resultado.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="355">
@@ -620,7 +618,26 @@
     <entry file="file://$PROJECT_DIR$/componentes/header.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="355">
-          <caret line="93" column="62" selection-start-line="93" selection-start-column="62" selection-end-line="93" selection-end-column="62" />
+          <caret line="93" column="59" selection-start-line="93" selection-start-column="59" selection-end-line="93" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/funciones/libro.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="134">
+          <caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pagina/libro.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="377">
+          <caret line="111" column="94" selection-start-line="111" selection-start-column="94" selection-end-line="111" selection-end-column="94" />
+          <folding>
+            <element signature="n#style#0;n#input#0;n#form#0;n#nav#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#ul#0;n#div#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/componentes/header.php b/componentes/header.php
index 011812e..02d1fd1 100644
--- a/componentes/header.php
+++ b/componentes/header.php
@@ -91,7 +91,7 @@ include ('../funciones/menu.php')
                     </li>
                 </ul>
             </div>
-            <form class="form-inline my-2 my-lg-0" action="../pagina/resultado.php" style="margin-right: 20px">
+            <form class="form-inline my-2 my-lg-0" action="pagina/resultado.php" style="margin-right: 20px">
                 <input class="" type="search"  aria-label="Search" name="id" style="  border: 2px solid #BB8800; background-color: #BB8800; color: white;border-bottom: 3px solid white;" placeholder="Buscar">
                 <svg style="margin-left: 8px;" width="20" height="20" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1216 832q0-185-131.5-316.5t-316.5-131.5-316.5 131.5-131.5 316.5 131.5 316.5 316.5 131.5 316.5-131.5 131.5-316.5zm512 832q0 52-38 90t-90 38q-54 0-90-38l-343-342q-179 124-399 124-143 0-273.5-55.5t-225-150-150-225-55.5-273.5 55.5-273.5 150-225 225-150 273.5-55.5 273.5 55.5 225 150 150 225 55.5 273.5q0 220-124 399l343 343q37 37 37 90z" fill="#fff"/></svg>
 
diff --git a/pagina/libro.php b/pagina/libro.php
index dae9d77..744257d 100644
--- a/pagina/libro.php
+++ b/pagina/libro.php
@@ -107,7 +107,7 @@
                         </ul>
                     </div>
 
-                    <form class="form-inline my-2 my-lg-0" action="pagina/resultado.php" style="margin-right: 20px">
+                    <form class="form-inline my-2 my-lg-0" action="../pagina/resultado.php" style="margin-right: 20px">
                         <input class="" type="search"  aria-label="Search" name="id" style="  border: 2px solid #BB8800; background-color: #BB8800; color: white;border-bottom: 3px solid white;" placeholder="Buscar">
                         <svg style="margin-left: 8px;" width="20" height="20" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1216 832q0-185-131.5-316.5t-316.5-131.5-316.5 131.5-131.5 316.5 131.5 316.5 316.5 131.5 316.5-131.5 131.5-316.5zm512 832q0 52-38 90t-90 38q-54 0-90-38l-343-342q-179 124-399 124-143 0-273.5-55.5t-225-150-150-225-55.5-273.5 55.5-273.5 150-225 225-150 273.5-55.5 273.5 55.5 225 150 150 225 55.5 273.5q0 220-124 399l343 343q37 37 37 90z" fill="#fff"/></svg>
                     </form>