*** empty log message ***

src/doc/man/en_us/man_dg.dat

@@ -901,17 +901,26 @@ inherits all the users of the parent.
 Users and systemgroups are created in the administrator:
 
 - Start the administrator with the command 'pwra'
-- Enter user mode from the menu 'File/Show Users'.
-- Login by entering the login command. Open the login prompt from the menu 'Functions/Command' 
-  and enter 'login’ on the command line. If the systemgroup 'administrator’ is present you
-  also has to add username and password to a user defined in the administrator systemgroup.
-- Enter edit mode from the menu 'Mode/Edit'.
-- Open the New System Group ('Edit/New SystemGroup' in the menu) dialog and enter name and 
-  attributes. Supply the full hierarchy name, e.g. 'Main.West’.
-- Select a system group and open the New User dialog ('Edit/New User') and enter username, 
-  password and privileges for the user.
-- Click in the Ok button.
-- Logout with the command 'logout’.
+- Enter the UserDatabase from the menu 'File/Open/UserDatabase'.
+- Login by entering the login command. Open the login prompt from the menu 'Functions/Command'
+  and enter 'login /adm’ on the command line. If the systemgroup 'administrator’ is presen
+  you also has to add username and password to a user defined in the administrator systemgroup.
+- Enter edit mode from the menu 'Edit/Edit mode'.
+  Systemgroups and users are represented by object of the classes SystemGroupReg and
+  UserReg, that are displayed in the palette to the left. An object is created by selecting
+  a class in the palette. After that, you click with the middle mousebutton on the future 
+  sibling or parent to the new object. If you click on the map/leaf in the destination object, 
+  the new object is placed as the first child, if you click to the right of the map/leaf, 
+  it is placed as a sibling.
+- Create a systemgroup by selecting 'SystemGroupReg' in the palette, and click with MB2
+  (the middle mousebutton) in the right window. Open the SystemGroupReg object and enter
+  name ant attribute for the system group. Enter the complete hierarchy name, e.g. 
+  'Main.West'.
+- Create a user by selecting 'UserReg' in the palette and click with MB2 on the map/leaf
+  of the SystemGroupReg object that the UserReg should be a child of. Open the object and
+  enter username, password and privileges for the user.
+- Save.
+- Logout with the command 'logout'.
 
 
 The user database reside in the directory $pwra_db.
@@ -927,15 +936,16 @@ all volumes is registered in a global volume.
 The registration is done by the administrator:
 
 - Start the administrator with the command 'pwra’
-- Enter volume mode from the menu 'File/Show volumes'.
-- Login
-- Enter edit mode from the menu 'Mode/Edit'.
-- If a volume in the volume list is selected, the new volume will be inserted after this 
-  volume, otherwise it is inserted last in the list.
-- Open the New volume dialog (Edit/New Volume), enter volume name, volume identity, and 
-  system name.
-- Click on the Ok button.
-- Logout with the command 'logout'
+- Enter volume mode from the menu 'File/Open/GlobalVolumeList'.
+- Login as administartor.
+- Enter edit mode from the menu 'Edit/Edit mode'.
+  Volumes are registred by objects of class VolumeReg, that is dislayed in the palette to
+  the left. In the palette, there is also the $Hier class, that can be used to order the
+  VolumeReg objects in a tree structure.
+- Create a VolumeReg object, open the object and enter volumename (equals objectname),
+  volumeidentity and project.  
+- Save.
+- Logout with the command 'logout'.
 
 <h2>Volume name
 The name of the volume, a unic name with max 31 characters.
@@ -969,13 +979,15 @@ overhead and make it harder to upgrade the project.
 Create the project in the administrator:
 
 - Start the administrator with the command 'pwra’.
-- The project mode is default when starting the administrator. If the current mode is User 
-  of Volume, enter Project mode from the menu 'File/Show projects'.
-- Login.
-- Enter edit mode from the menu 'Mode/Edit'.
-- Open the Create Volume dialog (Edit/Create Project), and enter project name, base version, 
-  path, hierarchy and description.
-- Logout.
+- The projectlist is shown as default when starting the administrator. It can also be opened
+  from the menu (File/Open/ProjectList).
+- Login as administrator.
+- Enter edit mode from the menu 'Edit/Edit mode'.
+  Projects are represented by objects of class ProjectReg, that is displayed in the palette
+  to the left. $Hier objects can be used to order the ProjectReg objects in a tree structure.
+- Create a ProjectReg object and enter project name, base version, path and description.
+- The project is created when saving. First you have to confirm the changes.
+- Save and logout.
 
 <h2>Project name
 A project has a project name that identifies the project in the development environment. It is 
@@ -996,10 +1008,6 @@ when creating a project you have to choose which base the project should point a
 The project consist of a directory tree where databases, source files, archives etc is stored. 
 The path is the root directory of this tree.
 
-<h2>Hierarchy
-The administrator can order the projects in a tree structure, and the hierarchy is the name 
-of the nodes in the tree separated by '-'. The hierarchy nodes of the tree will be created 
-by the administrator to match the specified name.
 </topic>
 </chapter>
 
@@ -1009,12 +1017,11 @@ Directory Volume Configuration
 
 <h1>Open a project
 When the project is created, it is found in the administrator project tree. You open a project 
-by selecting it and activate 'Edit/Open Project' in the menu. The workbench is now opened for 
-the project, and the Volume selection window is displayed, showing all the volumes in the 
-project. So far, only the DirectoryVolume is created, and our first task is to configure this 
-volume, with the volumes and nodes of the system.
+by activating 'Open Project' in the popupmenu for a ProjectReg object. The workbench is now 
+opened for the project, and the Volume selection window is displayed, showing all the volumes 
+in the project. So far, only the DirectoryVolume is created, and our first task is to configure 
+this volume, with the volumes and nodes of the system.
 
-?????
 Select the DirectoryVolume and click on the Ok button to open the configuration editor for the 
 volume. 
 

src/doc/man/sv_se/man_dg.dat

@@ -892,12 +892,13 @@ Anv
   trädstruktur och klickar man på mappen/lövet på ett existerande objekt läggs det nya objeket 
   som första barn, om kan klicka till höger om mappen/lövet läggs det som syskon.
 - Skapa en systemgrupp genom att markera 'SystemGroupReg' i paletten till vänster, och klicka
-  med MB2 (mittenknappen) i det högra fönstret. Öppna SystemGroup objektet och ange namn och
+  med MB2 (mittenknappen) i det högra fönstret. Öppna SystemGroupReg objektet och ange namn och
   attribut för systemgruppen. Ange fullständigt hierarkinamn, t ex 'Main.West'.
 - Skapa en användare genom att markera 'UserReg' i paletten och klicka med MB2 på mappen/lövet
   till det SystemGroupReg objekt som UserReg objektet ska ligga under. Öppna UserReg objektet
   och ange anvädarnamn, passerord och privilegier för användaren.
-- Spara och logga ut med kommandot 'logout'.
+- Spara.
+- Logga ut med kommandot 'logout'.
 
 Användardatabasen ligger på katalogen $pwra_db.
 
@@ -917,10 +918,11 @@ Registreringen g
 - Gå in i editerings läge, 'Edit/Edit mode' i menyn.
   Volymer registreras mha objekt av klassen VolumeReg som visas i paletten till vänster.
   I paletten finns även $Hier klassen, med vilken man kan ordna VolumeReg objekten 
-  hierarktisk.
+  hierarktiskt.
 - Skapa ett VolumeReg objekt, öppna objektet och ange volymsnamn (= objektsnamn), 
   volymsidentitet och projekt.
-- Spara och logga ut med 'logout'-kommandot.
+- Spara.
+- Logga ut med 'logout'-kommandot.
 
 <h2>Volymsnamn
 Namn på volymen, ska vara unikt och får ha max 31 tecken.
@@ -962,8 +964,7 @@ Skapa ett projekt i administrat
 - Gå in i edit mode från meny, 'Edit/Edit mode'.
   Projekt representeras av object av klassen ProjectReg, som visas i paletten till vänster.
   ProjectReg objekten kan ordnas i hierakier mha $Hier objekt.
-- Skapa ett ProjectReg objekt och ange projektnamn, basversion, filkatalog, hierarki och 
-  beskrivning.
+- Skapa ett ProjectReg objekt och ange projektnamn, basversion, filkatalog och beskrivning.
 - Projektet skapas när man sparar, efter att en verifiering har gjorts. Spara och logga ut.
 
 <h2>Projektnamn
@@ -985,10 +986,6 @@ vilket bas projektet ska peka p
 Projektet består av ett filkatalogsträd där databaser, källkodsfiler, arkiv mm lagras.
 Path är rot katalogen till det här trädet.
 
-<h2>Hierarchy
-Administratören kan ordna projekten i en trädstruktur, och hierarkin är namnet på noderna
-i träden separerade med '-'. Hierarki noderna i träden skapas av administratören för att
-matcha det specificerade namnet.
 </topic>
 </chapter>
 

src/tools/pkg/deb/pwrdemo/postinst

@@ -15,7 +15,7 @@ fi
 aroot="/usr/pwrp/adm"
 
 echo "Change owner of files to pwrp"
-chown -R pwrp /usr/pwrp/pwrdemo$ver
+chown -R pwrp:pwrp /usr/pwrp/pwrdemo$ver
 
 # Register volume
 if [ -e $aroot/db/pwr_volumelist.dat ]; then

wb/exe/wb_dbcheck/src/os_linux/link_rule.mk

@@ -7,7 +7,7 @@ link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
 	$(pwr_obj)/rt_io_user.o -L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib\
 	-L/opt/gnome/lib \
 	-lpwr_wb -lpwr_ge -lpwr_rt -lpwr_co -lpwr_flow -lpwr_glow\
-	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp -ldb_cxx-4.0\
+	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp -ldb_cxx\
         -lXmu -lSM -lICE\
 	-lrpcsvc -lpthread -lm -lrt
 

wb/exe/wb_wbltest/src/os_linux/link_rule.mk

@@ -8,7 +8,7 @@ link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
 	-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib\
 	-L/opt/gnome/lib \
 	-lpwr_wb -lpwr_ge -lpwr_rt -lpwr_co -lpwr_flow -lpwr_glow\
-	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp -ldb_cxx-4.0\
+	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp -ldb_cxx\
         -lXmu -lSM -lICE\
 	-lrpcsvc -lpthread -lm -lrt
 

wb/lib/wb/src/wb_cdrep.cpp

 /* 
- * Proview   $Id: wb_cdrep.cpp,v 1.29 2005-12-06 10:56:32 claes Exp $
+ * Proview   $Id: wb_cdrep.cpp,v 1.30 2006-02-01 07:36:23 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -238,13 +238,14 @@ void wb_cdrep::templateBody( pwr_tStatus *sts, pwr_eBix bix, void *p, pwr_tOid o
     if ( ODD(status) && templ->cid() == cid()) {
       templ->ref();
       localwb->readBody( &status, templ, bix, p);
-      templ->unref();
       if ( ODD(status)) {
 	if ( cdh_ObjidIsNotNull(o))
 	  updateTemplate( bix, p, o, templ->oid());
 	*sts = LDH__SUCCESS;
+	templ->unref();
 	return;
       }
+      templ->unref();
     }
   }
 

wb/lib/wb/src/wb_db.cpp

 /* 
- * Proview   $Id: wb_db.cpp,v 1.31 2006-01-27 11:15:48 claes Exp $
+ * Proview   $Id: wb_db.cpp,v 1.32 2006-02-01 07:36:23 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -930,6 +930,46 @@ static void printstat(DbEnv *ep, char *s)
   printf("\n");
 }
 
+extern "C" {
+  //! Compare wb_db_class keys
+  /*!
+    - return <0 if ap < tp
+    - return 0 if ap = tp.
+    - return >0 if ap > tp.
+  */
+  typedef struct {
+    pwr_tCid cid;
+    pwr_tOid oid;
+  } k_t;
+
+  int wb_db_class_bt_compare(DB *dp, const DBT *ap, const DBT *tp)
+  {
+
+    k_t *akp = (k_t *)ap->data;
+    k_t *tkp = (k_t *)tp->data;
+
+    if (ap->size == 0 || tp->size == 0 || ap->size != tp->size)
+      printf("a.size: %d, t.size: %d\n", ap->size, tp->size);
+
+    if (akp->cid == tkp->cid) {
+      if (akp->oid.vid == tkp->oid.vid) {
+	if (akp->oid.oix == tkp->oid.oix)
+	  return 0;
+	else if (akp->oid.oix < tkp->oid.oix)
+	  return -1;
+	else
+	  return 1;
+      } else if (akp->oid.vid < tkp->oid.vid)
+	return -1;
+      else
+	return 1;
+    } else if (akp->cid < tkp->cid)
+      return -1;
+    else
+      return 1;
+  }
+};
+
 void wb_db::openDb(bool useTxn)
 {
   struct stat sb;
@@ -984,6 +1024,9 @@ void wb_db::openDb(bool useTxn)
   m_t_name  = new Db(m_env, 0);
   m_t_info  = new Db(m_env, 0);
 
+  rc = m_t_class->set_bt_compare(wb_db_class_bt_compare);
+  // printf("m_t_class->set_bt_compare %d\n", rc);
+
 #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0    
   u_int32_t flags;
   if (useTxn) flags = DB_CREATE | DB_AUTO_COMMIT; 

xtt/exe/wb_ge/src/os_linux/link_rule.mk

@@ -9,6 +9,6 @@ link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	-lpwr_ge -lpwr_wb -lpwr_flow -lpwr_glow -lpwr_rt -lpwr_co \
 	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
         -lXmu -lSM -lICE\
-	-lrpcsvc -lpthread -lm -ldb_cxx-4.0 -lz
+	-lrpcsvc -lpthread -lm -ldb_cxx -lz
 
 endif