Commit ac3989ce authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Some changes

parent b0d4abb8

.idea/workspace.xml

+39 −50
Original line number Diff line number Diff line
@@ -2,12 +2,7 @@ 
<project version="4">

  <component name="ChangeListManager">

    <list default="true" id="a18ea2b9-bbc4-496b-b324-f0c9ff012408" name="Default" comment="">

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources.xml" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/opds_catalog/feeds.py" afterPath="$PROJECT_DIR$/opds_catalog/feeds.py" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/opds_catalog/management/commands/sopds.py" afterPath="$PROJECT_DIR$/opds_catalog/management/commands/sopds.py" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/opds_catalog/models.py" afterPath="$PROJECT_DIR$/opds_catalog/models.py" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/opds_catalog/opdsdb.py" afterPath="$PROJECT_DIR$/opds_catalog/opdsdb.py" />

    </list>

    <ignored path="sopds.iws" />

    <ignored path=".idea/workspace.xml" />
@@ -53,10 +48,10 @@ 
  </component>

  <component name="FileEditorManager">

    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">

      <file leaf-file-name="feeds.py" pinned="false" current-in-tab="false">

      <file leaf-file-name="feeds.py" pinned="false" current-in-tab="true">

        <entry file="file://$PROJECT_DIR$/opds_catalog/feeds.py">

          <provider selected="true" editor-type-id="text-editor">

            <state vertical-scroll-proportion="0.0">

            <state vertical-scroll-proportion="3.1590552">

              <caret line="125" column="117" selection-start-line="125" selection-start-column="117" selection-end-line="125" selection-end-column="117" />

              <folding>

                <element signature="e#0#27#0" expanded="true" />
@@ -65,11 +60,11 @@ 
          </provider>

        </entry>

      </file>

      <file leaf-file-name="models.py" pinned="false" current-in-tab="true">

      <file leaf-file-name="models.py" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/opds_catalog/models.py">

          <provider selected="true" editor-type-id="text-editor">

            <state vertical-scroll-proportion="0.51264757">

              <caret line="109" column="40" selection-start-line="109" selection-start-column="40" selection-end-line="109" selection-end-column="40" />

            <state vertical-scroll-proportion="0.0">

              <caret line="90" column="9" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />

              <folding>

                <element signature="e#0#28#0" expanded="true" />

              </folding>
@@ -80,7 +75,7 @@ 
      <file leaf-file-name="console.sql" pinned="false" current-in-tab="false">

        <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/af8add93-a973-4227-8140-03ebe8a656a0/console.sql">

          <provider selected="true" editor-type-id="text-editor">

            <state vertical-scroll-proportion="-0.0">

            <state vertical-scroll-proportion="0.0">

              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />

              <folding />

            </state>
@@ -124,25 +119,23 @@ 
          </provider>

        </entry>

      </file>

      <file leaf-file-name="sopds.py" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/opds_catalog/management/commands/sopds.py">

      <file leaf-file-name="views.py" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/opds_catalog/views.py">

          <provider selected="true" editor-type-id="text-editor">

            <state vertical-scroll-proportion="0.0">

              <caret line="51" column="23" selection-start-line="51" selection-start-column="23" selection-end-line="51" selection-end-column="23" />

              <folding>

                <element signature="e#0#14#0" expanded="true" />

              </folding>

              <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />

              <folding />

            </state>

          </provider>

        </entry>

      </file>

      <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/opds_catalog/urls.py">

      <file leaf-file-name="sopds.py" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/opds_catalog/management/commands/sopds.py">

          <provider selected="true" editor-type-id="text-editor">

            <state vertical-scroll-proportion="0.0">

              <caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />

              <caret line="51" column="23" selection-start-line="51" selection-start-column="23" selection-end-line="51" selection-end-column="23" />

              <folding>

                <element signature="e#1#33#0" expanded="true" />

                <element signature="e#0#14#0" expanded="true" />

              </folding>

            </state>

          </provider>
@@ -257,6 +250,7 @@ 
    </navigator>

    <panes>

      <pane id="Scope" />

      <pane id="Scratches" />

      <pane id="ProjectPane">

        <subPane>

          <PATH>
@@ -363,7 +357,6 @@ 
          </PATH>

        </subPane>

      </pane>

      <pane id="Scratches" />

    </panes>

  </component>

  <component name="PropertiesComponent">
@@ -654,17 +647,17 @@ 
    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />

    <editor active="true" />

    <layout>

      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25746268" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />

      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26012793" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />

      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />

      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />

      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1401919" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />

      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32719395" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />

      <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.13542795" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />

      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936078" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />

      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32719395" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />

      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />

      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28169015" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />

      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />

      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28169015" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />

      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3997833" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />

      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />

      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />

      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />

      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -964,7 +957,6 @@ 
      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="179" column="36" selection-start-line="179" selection-start-column="26" selection-end-line="179" selection-end-column="36" />

          <folding />

        </state>

      </provider>

    </entry>
@@ -972,15 +964,6 @@ 
      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="7733" column="53" selection-start-line="7733" selection-start-column="53" selection-end-line="7733" selection-end-column="53" />

          <folding />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/views.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />

          <folding />

        </state>

      </provider>

    </entry>
@@ -988,7 +971,6 @@ 
      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="4" column="86" selection-start-line="4" selection-start-column="86" selection-end-line="4" selection-end-column="86" />

          <folding />

        </state>

      </provider>

    </entry>
@@ -1028,7 +1010,6 @@ 
      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="-0.0">

          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />

          <folding />

        </state>

      </provider>

    </entry>
@@ -1058,16 +1039,6 @@ 
        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/feeds.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="125" column="117" selection-start-line="125" selection-start-column="117" selection-end-line="125" selection-end-column="117" />

          <folding>

            <element signature="e#0#27#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="dbDummy://dbtable:/969a8559/af8add93-a973-4227-8140-03ebe8a656a0/opds_catalog_counter">

      <provider editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">
@@ -1093,13 +1064,31 @@ 
    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/models.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.51264757">

          <caret line="109" column="40" selection-start-line="109" selection-start-column="40" selection-end-line="109" selection-end-column="40" />

        <state vertical-scroll-proportion="0.0">

          <caret line="90" column="9" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />

          <folding>

            <element signature="e#0#28#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/views.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />

          <folding />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/feeds.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="3.1590552">

          <caret line="125" column="117" selection-start-line="125" selection-start-column="117" selection-end-line="125" selection-end-column="117" />

          <folding>

            <element signature="e#0#27#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

  </component>

</project>
 
 No newline at end of file

opds_catalog/feeds.py

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ class MainFeed(Feed): 
    def items(self):

        return [

                    {"id":1, "title":_("By catalogs"), "link":"opds_catalog:catalogs",

                     "descr": _("Catalogs: %(catalogs)s, books: %(books)s.")%{"catalogs":Counter.objects.get_counter(models.counter_allbooks),"books":Counter.objects.get_counter(models.counter_allcatalogs)}},

                     "descr": _("Catalogs: %(catalogs)s, books: %(books)s.")%{"catalogs":Counter.objects.get_counter(models.counter_allcatalogs),"books":Counter.objects.get_counter(models.counter_allbooks)}},

                    {"id":2, "title":_("By authors"), "link":"opds_catalog:authors",

                     "descr": _("Authors: %(authors)s.")%{"authors":Counter.objects.get_counter(models.counter_allauthors)}},

                    {"id":3, "title":_("By titles"), "link":"opds_catalog:titles",