readme update + database edit

README.org

 #+TITLE: Readme
+* Fi printers - Install script for printers under Linux with samba
+** Advantages:
++ Pure IPP printing allows only printing via Ethernet cable. This restriction does not apply to samba.
++ You can use your current cups settings and just add fi printers. (For example if you use your laptop you don't have to switch cups configuration)
++ Printing is not bound to your username on your computer.
+** Files/Folders:
++ ~install.pl~ - The main install script 
++ ~filters~ - folder with filters for cups
++ ~ppds~ - folder with ppds for cups
++ ~PyPDF2~ and ~reportlab~ - folder with python 2 dependencies for ~TA5007ci~
+** Pre-requirements:
++ root access (or sudo)
++ Local print server (~cups~) 
++ samba (~smbclient~)
++ for ~TA5007ci~ python2
+*** Note
+If you have previously used pure IPP printing, you might want to cancel printing from you machine. If that is the case, send a request to unix@fi.muni.cz.
+** Usage
+usage: ~./install.pl <printer-name>~
+
+where ~<printer-name>~ is valid printer name:
+
+| Printer name | Model       | Location                                     |
+|--------------+-------------+----------------------------------------------|
+| copy2a       | TA4505ci    | Building A, 2nd floor kitchen                |
+| copy3a       | TA4505ci    | Building A, 3th floor kitchen                |
+| copy4a       | TA4505ci    | Building A, 4th floor kitchen                |
+| copy4b       | TA5007ci    | Building B, 4th floor                        |
+| copy4c       | TA4505ci    | Building C, 4th floor                        |
+| copy5b       | TA5007ci    | Building B, 5th floor                        |
+| copy5c       | TA4505ci    | Building C, 5th floor                        |
+| lj-a302      | hplj-600    | Building A, 3th floor A302 LaSArIS           |
+| lj-b010      | OKI-C531dn  | Building B, groundfloor, Building Management |
+| lj2a         | hplj-600    | Building A, 2nd floor kitchen                |
+| lj2b         | hplj-p3015  | Building B, 2nd floor, kitchen               |
+| lj3a         | hplj-600    | Building A, 3th floor kitchen                |
+| lj3b         | hplj-p4515x | Building B, 3th floor, kitchen               |
+| lj4a         | hplj-600    | Building A, 4th floor kitchen                |
+| lj4c         | hplj-600    | Building C, 4th floor, next to copy          |
+| lj4p         | hplj-p4015x | Building B, 4th floor, next to copy          |
+| lj5c         | hplj-600    | Building C, 5th floor, next to copy          |
+
+
+
+
+
+
+
 
 * Current status:
 - [X] hp laserjet 600
-- [-] HP LaserJet P4515x
-- [-] HP LaserJet P4015x
+- [X] HP LaserJet P4515x
+- [X] HP LaserJet P4015x
 - [X] TA 4505ci
 - [X] TA 5007ci
+- [ ] OKI-C531dn 
+    UNTESTED 
 

install.pl

@@ -23,7 +23,7 @@ my $printers = {
         'location' => 'Building A, 3th floor kitchen'
     },
     'lj5c' => {
-        'model'    => 'hp-laserjet-600',
+        'model'    => 'hplj-600',
         'location' => 'Building C, 5th floor, next to copy'
     },
     'copy5b' => {
@@ -31,18 +31,19 @@ my $printers = {
         'location' => 'Building B, 5th floor'
     },
     'lj-b010' => {
-        'location' => 'Building B, groundfloor, Building Management'
+        'location' => 'Building B, groundfloor, Building Management',
+        'model'    => 'OKI-C531dn'
     },
     'lj4c' => {
         'location' => 'Building C, 4th floor, next to copy',
-        'model'    => 'hp-laserjet-600'
+        'model'    => 'hplj-600'
     },
     'lj4p' => {
-        'model'    => 'hp-laserjet-p4015x',
+        'model'    => 'hplj-p4015x',
         'location' => 'Building B, 4th floor, next to copy'
     },
     'lj4a' => {
-        'model'    => 'hp-laserjet-600',
+        'model'    => 'hplj-600',
         'location' => 'Building A, 4th floor kitchen'
     },
     'copy4a' => {
@@ -55,10 +56,10 @@ my $printers = {
     },
     'lj3a' => {
         'location' => 'Building A, 3th floor kitchen',
-        'model'    => 'hp-laserjet-600'
+        'model'    => 'hplj-600'
     },
     'lj2a' => {
-        'model'    => 'hp-laserjet-600',
+        'model'    => 'hplj-600',
         'location' => 'Building A, 2nd floor kitchen'
     },
     'copy5c' => {
@@ -66,19 +67,19 @@ my $printers = {
         'location' => 'Building C, 5th floor'
     },
     'lj3b' => {
-        'model'    => 'hp-laserjet-p4515x',
+        'model'    => 'hplj-p4515x',
         'location' => 'Building B, 3th floor, kitchen'
     },
     'lj-a302' => {
         'location' => 'Building A, 3th floor A302 LaSArIS',
-        'model'    => 'hp-laserjet-600'
+        'model'    => 'hplj-600'
     },
     'copy4c' => {
         'model'    => 'TA4505ci',
         'location' => 'Building C, 4th floor'
     },
     'lj2b' => {
-        'model'    => 'hp-laserjet-p3015',
+        'model'    => 'hplj-p3015',
         'location' => 'Building B, 2nd floor, kitchen'
     }
 };
@@ -91,7 +92,7 @@ my $models = {
         'filters' => ['kyofilter_B'],
         'options' => [ 'Option19=One', 'Option21=True', 'Option17=DF730' ]
     },
-    'hp-laserjet-600' => {
+    'hplj-600' => {
         'options' => ['HPOption_Duplexer=True'],
     }
 };
@@ -182,10 +183,11 @@ sub copy_filter {
 
 sub print_printers() {
     say "Available printers:";
-    printf "%-14s | %s\n", "Printer name", "Location";
-    say "-" x 50;
+    printf "%-14s | %-12s| %s\n", "Printer name", "Model", "Location";
+    say "-" x 70;
     for ( sort keys %$printers ) {
-        printf "%-14s | %s\n", $_, $printers->{$_}->{location};
+        printf "%-14s | %-12s| %s\n", $_, $printers->{$_}->{'model'},
+          $printers->{$_}->{'location'};
     }
     return;
 }